合并swebtest代码

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("日期")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java

@@ -65,6 +65,10 @@ public class SwebVendorStock extends BaseBean {
     @ApiParam("周")
     private String countWeek;
 
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
     @Transient
     @ApiParam("日期")
     private String dateStart;