From bd927f5c9f26d5ae89a272e56a4b3bd655bd148f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:19:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java | 14 +++++++++++++-
1 files changed, 13 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 932a4d6..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
@@ -14,6 +14,8 @@
@Data
public class ExportMerchantVO {
+ private Long id;
+
@ExcelProperty("商家名称")
private String name;
@@ -57,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) {
@@ -66,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