Merge remote-tracking branch 'origin/test' into test

5 years ago · 667d80c37d
parent 0c044eed91 7b2c49f638
commit 667d80c37d
1 changed files with 5 additions and 1 deletions
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java
@ -63,7 +63,11 @@ public class SwebRequireAlarm extends BaseBean {

    @Column(name = "COUNT_DATE")
    @ApiParam("日期")
-    private Double countDate;
+    private String countDate;
+
+    @Column(name = "REQUEST_QTY")
+    @ApiParam("需求数量")
+    private String requestQty;

    @Transient
    @ApiParam("日期")