Skip to content

T
tianjin-cement
Commit cee99472 authored by 竹天卫's avatar 竹天卫
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

parents 6da27071 9b8f30e9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardApproval.java
View file @ cee99472
...@@ -39,7 +39,7 @@ public class NonStandardApproval implements Serializable { ...@@ -39,7 +39,7 @@ public class NonStandardApproval implements Serializable {
private String account; private String account;
@ApiModelProperty("起止日期") @ApiModelProperty("起止日期")
private LocalDate statistical; private String statistical;
@ApiModelProperty("上报工时") @ApiModelProperty("上报工时")
private Double reportedHours; private Double reportedHours;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardValue.java
View file @ cee99472
...@@ -39,7 +39,7 @@ public class NonStandardValue implements Serializable { ...@@ -39,7 +39,7 @@ public class NonStandardValue implements Serializable {
private String account; private String account;
@ApiModelProperty("起止日期") @ApiModelProperty("起止日期")
private LocalDate statistical; private String statistical;
@ApiModelProperty("上报工时") @ApiModelProperty("上报工时")
private Double reportedHours; private Double reportedHours;
......
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