Merge branch 'dev' into prod

2025-11-05 17:08:18 +08:00
parent 44636808d9 e574a6456d
commit 5b520fa0ea
2 changed files with 3 additions and 3 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
@@ -21,7 +21,7 @@ public class DistributionCenterShopVO implements Serializable {
    //收益
    private String income;
    //是否开启
-    private Boolean isEnabled;
+    private Boolean isEnable;