Merge remote-tracking branch 'origin/master'

ruoyi-warehouse/src/main/java/com/ruoyi/anpin/MarketOut.java

@@ -37,6 +37,16 @@ public class MarketOut {
     private String fPrintLog;
     @Excel(name = "开票公司")
     private String fsbuName;
+    @Excel(name = "仓库")
+    private String thfName;
+
+    public String getThfName() {
+        return thfName;
+    }
+
+    public void setThfName(String thfName) {
+        this.thfName = thfName;
+    }
 
     public String getfBillno() {
         return fBillno;

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

@@ -3079,6 +3079,7 @@
         tp.f_name AS projectName,
         tc.f_name AS corpName,
         tw.f_money AS fMoney,
+        th.f_name AS thfName,
         tw.create_by AS createBy,
         tw.create_time AS createTime,
         CASE