Skip to content

R
ry-crm
Commit c77cf82e authored by EDY's avatar EDY
Browse files
Options

优化

parent 5ca89a7b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseContractInfo.java
View file @ c77cf82e
...@@ -128,7 +128,7 @@ public class BaseContractInfo extends BaseEntity ...@@ -128,7 +128,7 @@ public class BaseContractInfo extends BaseEntity
/** 合同生效时间 */ /** 合同生效时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "合同生效时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "合同生效时间", width = 30, dateFormat = "yyyy-MM-dd HH: mm:ss")
private Date htsxsj; private Date htsxsj;
/** 合同终止时间 */ /** 合同终止时间 */
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseCustomInfo.java
View file @ c77cf82e
...@@ -69,11 +69,11 @@ public class BaseCustomInfo extends BaseEntity ...@@ -69,11 +69,11 @@ public class BaseCustomInfo extends BaseEntity
private Long khzt; private Long khzt;
/** 归属 1 个人 2 部门 */ /** 归属 1 个人 2 部门 */
@Excel(name = "归属 1 个人 2 部门") //@Excel(name = "归属 1 个人 2 部门")
private Integer gs; private Integer gs;
/** 归属id */ /** 归属id */
@Excel(name = "归属id") //@Excel(name = "归属id")
private Long gsId; private Long gsId;
/** 负责人 */ /** 负责人 */
...@@ -91,7 +91,7 @@ public class BaseCustomInfo extends BaseEntity ...@@ -91,7 +91,7 @@ public class BaseCustomInfo extends BaseEntity
private String bz; private String bz;
/** 是否删除 1 删除 0 正常 */ /** 是否删除 1 删除 0 正常 */
@Excel(name = "是否删除 1 删除 0 正常") // @Excel(name = "是否删除 1 删除 0 正常")
private Long deleteFlag; private Long deleteFlag;
private String[] customTrade; private String[] customTrade;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment