Skip to content

R
RuoYi-Vue-master
Commit bf9cb0ee authored by 杨帆's avatar 杨帆
Browse files
Options

Merge branch 'dev-yf' into 'develop' 

Dev yf

See merge request !11
parents 8becdf93 a0a5c7a3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlan.java
View file @ bf9cb0ee
...@@ -61,13 +61,13 @@ public class RiskPlan extends BaseEntity ...@@ -61,13 +61,13 @@ public class RiskPlan extends BaseEntity
private Long approveUserId; private Long approveUserId;
/** 开始时间 */ /** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime; private Date startTime;
/** 结束时间 */ /** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** 状态 */ /** 状态 */
......
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