zengtx 3 роки тому
батько
коміт
8fcf392a3d

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderData.java

@@ -180,4 +180,8 @@ public class SyOrderData {
 	@ApiModelProperty(value = "发货状态")
 	private java.lang.String dilivery;
 
+	/**发货状态*/
+	@Excel(name = "成衣加工商", width = 15)
+	@ApiModelProperty(value = "成衣加工商")
+	private java.lang.String garmentFactory;
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataItem.java

@@ -163,5 +163,5 @@ public class SyOrderDataItem {
 
 	@Excel(name = "订单剩余数量", width = 15)
 	@ApiModelProperty(value = "订单剩余数量")
-	private int surplusNum;
+	private java.math.BigDecimal surplusNum;
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/OrderDataVo.java

@@ -165,7 +165,7 @@ public class OrderDataVo {
 
     @Excel(name = "订单剩余数量", width = 15)
     @ApiModelProperty(value = "订单剩余数量")
-    private String surplusNum;
+    private java.math.BigDecimal surplusNum;
 
     @Excel(name = "含税单价", width = 15)
     @ApiModelProperty(value = "含税单价")