Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/user/SysUserEditPwdDTO.java

@@ -32,7 +32,7 @@ public class SysUserEditPwdDTO {
     /**
      * 密码
      */
-    @Size(min = 1, message = "密码不为空")
+    @NotBlank(message = "确认密码不为空")
     private String password;
 
 

cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java

@@ -4,6 +4,7 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -88,4 +89,7 @@ public class FreeDineConfig implements Serializable {
      */
     private String childShopIdList;
 
+    public Integer getMultiple() {
+        return rechargeTimes == null ? 2 : rechargeTimes;
+    }
 }