Merge branch 'dev' into prod

2025-11-05 17:02:42 +08:00
parent 02cea05706 c1b15950ba
commit 17e58f9158
2 changed files with 8 additions and 2 deletions
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/DistributionCenterShopVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/DistributionCenterShopVO.java
@@ -20,6 +20,10 @@ public class DistributionCenterShopVO implements Serializable {
    private String shopAddress;
    //收益
    private String income;
+    //是否开启
+    private Boolean isEnabled;
+
+

    //标签内容
    private String labelContent;