From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java
index abd4bdc..6bee3cc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java
@@ -59,8 +59,16 @@
         this.businessStatus = businessStatus ? "在营" : "已关闭";
     }
 
+    public void setBusinessStatus(String businessStatus) {
+        this.businessStatus = businessStatus;
+    }
+
     public void setAccountStatus(Integer accountStatus) {
         this.accountStatus = accountStatus.intValue() == 1 ? "启用" : "禁用";
+    }
+
+    public void setAccountStatus(String accountStatus) {
+        this.accountStatus = accountStatus;
     }
 
     public void setBusinessTimeTime(String businessTime) {
@@ -68,8 +76,10 @@
             this.businessTime = businessTime.replace("EVERY_DAY", "每天:");
         } else if (businessTime.contains("WEEKDAY")) {
             this.businessTime = businessTime.replace("WEEKDAY", "周一至周五:");
-        } else {
+        } else if (businessTime.contains("WEEKEND")) {
             this.businessTime = businessTime.replace("WEEKEND", "周末:");
+        } else {
+            this.businessTime = businessTime;
         }
     }
 }

--
Gitblit v1.7.1