Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.4

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/worktime/domain/SysWorkTime.java

@@ -3,6 +3,7 @@ package com.xunmei.common.core.domain.worktime.domain;
 import java.util.Date;
 import java.util.Objects;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -85,6 +86,7 @@ public class SysWorkTime extends BaseEntity {
      * 营业终了
      */
     @ApiModelProperty(value = "营业终了")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String closeTime;
 
     @ApiModelProperty(value = "月份")
@@ -108,6 +110,7 @@ public class SysWorkTime extends BaseEntity {
      * 营业时间
      */
     @ApiModelProperty(value = "营业时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String openTime;
 
     /**
@@ -133,12 +136,14 @@ public class SysWorkTime extends BaseEntity {
      * 下班时间
      */
     @ApiModelProperty(value = "下班时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String workOffTime;
 
     /**
      * 上班时间
      */
     @ApiModelProperty(value = "上班时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String workTime;
     /**
      * 是否值班打卡

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeSet.java

@@ -3,6 +3,7 @@ package com.xunmei.system.domain;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -143,6 +144,7 @@ public class SysWorkTimeSet extends BaseEntity {
      * 下班时间
      */
     @ApiModelProperty(value = "下班时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String workOffTime;
 
     /**