Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/entity/SysDevice.java

@@ -1,5 +1,7 @@
 package com.qmth.sop.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.base.BaseEntity;
@@ -42,6 +44,7 @@ public class SysDevice extends BaseEntity implements Serializable {
     private String model;
 
     @ApiModelProperty(value = "购买时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
 //    @NotNull(message = "购买时间不能为空")
     private Long buyTime;
 

sop-business/src/main/resources/db/log/shudonghui_update_log.sql

@@ -429,4 +429,14 @@ INSERT INTO `sys_ding_date` (`id`, `year`, `month`, `day`, `type`) VALUES (48, 2
 INSERT INTO `sys_ding_date` (`id`, `year`, `month`, `day`, `type`) VALUES (49, 2024, 4, 28, 'WEEKDAY');
 
 --2023.11.14
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1099, '二期接口', '/api/admin/tb/crm/analyse/project/count', 'URL', 64, 32, 'SYS', NULL, 1, 1, 0);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1099, '二期接口', '/api/admin/tb/crm/analyse/project/count', 'URL', 64, 32, 'SYS', NULL, 1, 1, 0);
+ALTER TABLE `sys_device` MODIFY COLUMN `buy_time` bigint NULL COMMENT '购买时间' AFTER `model`;
+
+
+
+
+
+
+
+
+