Merge branch 'test' of frank.yu/i3plus-pojo into test

4 years ago · 1a5a3c24bc
parent a8fafb2443 70b4bc75e8
commit 1a5a3c24bc
1 changed files with 2 additions and 2 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java
@ -25,10 +25,10 @@ public class ConditionQueryModel {
    private String customerPartNo;

    @ApiParam("开始时间")
-    private String modifyStartTime;
+    private String modifyStartDate;

    @ApiParam("结束时间")
-    private String modifyEndTime;
+    private String modifyEndDate;

    @ApiParam("零件二维码")
    private String serialNumber;