Merge remote-tracking branch 'origin/master'

# Conflicts: # cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java
2025-02-18 14:26:54 +08:00
parent 703c4906f9 25854ad51e
commit c373928ece
2 changed files with 2 additions and 2 deletions
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java
@@ -39,7 +39,7 @@ public class ShopUserMoneyEditDTO {
    @DecimalMax("9999")
    private BigDecimal money;

-    private ShopUserFlowBizEnum bizEnum;
+    private String bizEnum;
    /**
     * 备注
     */