Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -218,6 +218,34 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
     @TableField(exist = false)
     private String searchKeyWord;
 
+    /**
+     * 剩余(吨)
+     */
+    @TableField(exist = false)
+    private Double surplus;
+    /**
+     * 利润(万元)
+     */
+    @TableField(exist = false)
+    private Double profit;
+    /**
+     * 销售额(万元)
+     */
+    @TableField(exist = false)
+    private Double salesVolume;
+    /**
+     * 收购量(吨)
+     */
+    @TableField(exist = false)
+    private Double acquisitionWeight;
+    /**
+     * 销量(吨)
+     */
+    @TableField(exist = false)
+    private Double saleWeight;
+
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;