diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java index 19e6845..070d847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -18,7 +19,8 @@ * @author cz * @since 2023-04-03 */ -@Data +@Getter +@Setter @TableName("system_file_config") public class SystemFileConfig implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java index 19e6845..070d847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -18,7 +19,8 @@ * @author cz * @since 2023-04-03 */ -@Data +@Getter +@Setter @TableName("system_file_config") public class SystemFileConfig implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java index 886bd1f..eec2963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -22,7 +22,7 @@ /** *

- * 系统管理-常用工具-签名管理表 + * 系统管理-常用工具-签章/签名管理表 *

* * @author wangpeng @@ -54,36 +54,36 @@ private Integer systemType; /** - * 签名编号 + * 签章/签名编号 */ @ExcelProperty("编号") - @ApiModelProperty(value = "签名编号", dataType = "String") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") @NotBlank(message = "编号不能为空") @TableField("sign_no") private String signNo; /** - * 签名名称 + * 签章/签名名称 */ @ExcelProperty("名称") - @ApiModelProperty(value = "签名编号", dataType = "String") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") @NotBlank(message = "名称不能为空") @TableField("sign_name") private String signName; /** - * 签名描述 + * 签章/签名描述 */ @ExcelProperty("描述") - @ApiModelProperty(value = "签名描述", dataType = "String") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") @TableField("sign_desc") private String signDesc; /** - * 签名负责人 + * 签章/签名负责人 */ @ExcelProperty("负责人") - @ApiModelProperty(value = "签名负责人", dataType = "String") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") @NotBlank(message = "负责人不能为空") @TableField("sign_director") private String signDirector; @@ -95,12 +95,12 @@ private Long signUserId; /** - * 签章或签名-字典code(西昌废弃) + * 签章或签名-字典code */ -// @ApiModelProperty(value = "签名-字典code", dataType = "String") -// @NotBlank(message = "类型不能为空") -// @TableField("sign_type") -// private String signType; + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; /** * minio存储文件名 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java index 19e6845..070d847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java @@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -18,7 +19,8 @@ * @author cz * @since 2023-04-03 */ -@Data +@Getter +@Setter @TableName("system_file_config") public class SystemFileConfig implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java index 886bd1f..eec2963 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -22,7 +22,7 @@ /** *

- * 系统管理-常用工具-签名管理表 + * 系统管理-常用工具-签章/签名管理表 *

* * @author wangpeng @@ -54,36 +54,36 @@ private Integer systemType; /** - * 签名编号 + * 签章/签名编号 */ @ExcelProperty("编号") - @ApiModelProperty(value = "签名编号", dataType = "String") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") @NotBlank(message = "编号不能为空") @TableField("sign_no") private String signNo; /** - * 签名名称 + * 签章/签名名称 */ @ExcelProperty("名称") - @ApiModelProperty(value = "签名编号", dataType = "String") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") @NotBlank(message = "名称不能为空") @TableField("sign_name") private String signName; /** - * 签名描述 + * 签章/签名描述 */ @ExcelProperty("描述") - @ApiModelProperty(value = "签名描述", dataType = "String") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") @TableField("sign_desc") private String signDesc; /** - * 签名负责人 + * 签章/签名负责人 */ @ExcelProperty("负责人") - @ApiModelProperty(value = "签名负责人", dataType = "String") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") @NotBlank(message = "负责人不能为空") @TableField("sign_director") private String signDirector; @@ -95,12 +95,12 @@ private Long signUserId; /** - * 签章或签名-字典code(西昌废弃) + * 签章或签名-字典code */ -// @ApiModelProperty(value = "签名-字典code", dataType = "String") -// @NotBlank(message = "类型不能为空") -// @TableField("sign_type") -// private String signType; + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; /** * minio存储文件名 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java index 34b0650..762334a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -9,7 +9,7 @@ /** *

- * 签名与用户关联表(签名可使用人) + * 签章/签名与用户关联表(签章/签名可使用人) *

* * @author wangpeng @@ -25,7 +25,7 @@ private Long id; /** - * 签名表id + * 签章/签名表id */ @TableField("sign_id") private Long signId;