Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

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

@@ -166,12 +166,18 @@ public class SyOrderData {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
 	private java.lang.Object memo;
-	/**备注*/
+	/**供应商*/
 	@Excel(name = "供应商", width = 15)
 	@ApiModelProperty(value = "供应商")
 	private java.lang.String supplier;
-	/**备注*/
+	/**账套*/
 	@Excel(name = "账套", width = 15)
 	@ApiModelProperty(value = "账套")
 	private java.lang.String account;
+
+	/**发货状态*/
+	@Excel(name = "发货状态", width = 15)
+	@ApiModelProperty(value = "发货状态")
+	private java.lang.String dilivery;
+
 }