Merge branch '_update_bug' of zhujiawei/WarehouseManagement into dev

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWareHouseExcelItems.java

@@ -76,6 +76,18 @@ public class TWareHouseExcelItems {
     @Excel(name = "备注")
     private String  remark;
 
+    /** 计费日期 */
+    @Excel(name = "计费日期")
+    private String  priceDateRemarks;
+
+    public String getPriceDateRemarks() {
+        return priceDateRemarks;
+    }
+
+    public void setPriceDateRemarks(String priceDateRemarks) {
+        this.priceDateRemarks = priceDateRemarks;
+    }
+
     public String getfId() {
         return fId;
     }

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -586,6 +586,7 @@
             wi.f_billing_days AS fBillingDays,
             wi.f_inventory_days AS fInventoryDays,
             wi.f_amt AS fAmt,
+            wi.price_date_remarks AS priceDateRemarks,
             wi.remark AS remark
         FROM
             t_warehousebills w