Merge branch 'develop' into release

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/Customer.java

@@ -1,6 +1,5 @@
 package org.dromara.customerManagement.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
@@ -18,7 +17,6 @@ public class Customer extends TenantEntity {
     /**
      * 用户名
      */
-    @NotBlank(message = "用户名不能为空")
     private String username;
     /**
      * 密码
@@ -31,21 +29,19 @@ public class Customer extends TenantEntity {
     /**
      * 手机号
      */
-    @NotBlank(message = "手机号不能为空")
     private String mobile;
     /**
      * 公司/工厂名称
      */
-    @NotBlank(message = "公司/工厂名称不能为空")
-    private String factory_name;
+    private String factoryName;
     /**
      * 营业执照
      */
-    private String business_license;
+    private String businessLicense;
     /**
      * 联系人
      */
-    private String contact_name;
+    private String contactName;
     /**
      * 头像
      */
@@ -57,7 +53,7 @@ public class Customer extends TenantEntity {
     /**
      * 账单结算类型
      */
-    private String bill_type;
+    private String billType;
     /**
      * 总公司id
      */

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/bo/CustomerBo.java

@@ -1,6 +1,7 @@
 package org.dromara.customerManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -20,6 +21,7 @@ public class CustomerBo extends BaseEntity {
     /**
      * 用户名
      */
+    @NotBlank(message = "用户名不能为空")
     private String username;
     /**
      * 密码
@@ -32,19 +34,21 @@ public class CustomerBo extends BaseEntity {
     /**
      * 手机号
      */
+    @NotBlank(message = "手机号不能为空")
     private String mobile;
     /**
      * 工厂名称
      */
-    private String factory_name;
+    @NotBlank(message = "工厂名称不能为空")
+    private String factoryName;
     /**
      * 营业执照
      */
-    private String business_license;
+    private String businessLicense;
     /**
      * 联系人
      */
-    private String contact_name;
+    private String contactName;
     /**
      * 头像
      */
@@ -56,7 +60,7 @@ public class CustomerBo extends BaseEntity {
     /**
      * 账单结算类型
      */
-    private String bill_type;
+    private String billType;
     /**
      * 总公司id
      */

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/vo/CustomerVo.java

@@ -35,15 +35,15 @@ public class CustomerVo extends BaseEntity {
     /**
      * 工厂名称
      */
-    private String factory_name;
+    private String factoryName;
     /**
      * 营业执照
      */
-    private String business_license;
+    private String businessLicense;
     /**
      * 联系人
      */
-    private String contact_name;
+    private String contactName;
     /**
      * 头像
      */
@@ -55,7 +55,7 @@ public class CustomerVo extends BaseEntity {
     /**
      * 账单结算类型
      */
-    private String bill_type;
+    private String billType;
     /**
      * 总公司id
      */