Merge branch 'refs/heads/dev' into test

pom.xml

@@ -19,7 +19,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.38</revision>
+        <revision>3.0.39</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -32,4 +33,13 @@ public class AccountPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "是否启用")
+    private String isEnable;
+
+    @Schema(description = "客商公司编码")
+    private String customerNumber;
+
+    @Schema(description = "客商公司名称")
+    private String customerName;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.base.controller.admin.base.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -40,4 +41,16 @@ public class AccountRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "是否启用")
+    @ExcelProperty("是否启用")
+    private String isEnable;
+
+    @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("客商公司编码")
+    private String customerNumber;
+
+    @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("客商公司名称")
+    private String customerName;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
@@ -31,4 +32,15 @@ public class AccountSaveReqVO {
     @NotEmpty(message = "税号/社会信用代码不能为空")
     private String taxNumber;
 
+    @Schema(description = "是否启用")
+    @ExcelProperty("是否启用")
+    private String isEnable;
+
+    @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "客商公司编码不能为空")
+    private String customerNumber;
+
+    @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "客商公司名称不能为空")
+    private String customerName;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -37,4 +38,10 @@ public class ContactPageReqVO extends PageParam {
 
     @Schema(description = "是否启用")
     private String isEnable;
+
+    @TableField("CSTM_NUM")
+    private String customerNumber;
+
+    @TableField("CSTM_NAME")
+    private String customerName;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java

@@ -47,4 +47,12 @@ public class ContactRespVO {
     @Schema(description = "是否启用")
     @ExcelProperty("是否启用")
     private String isEnable;
+
+    @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("客商公司编码")
+    private String customerNumber;
+
+    @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("客商公司名称")
+    private String customerName;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java

@@ -36,4 +36,12 @@ public class ContactSaveReqVO {
     @Schema(description = "是否启用")
     private String isEnable;
 
+    @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "客商公司编码不能为空")
+    private String customerNumber;
+
+    @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "客商公司名称不能为空")
+    private String customerName;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java

@@ -3,6 +3,8 @@ package com.zt.plat.module.base.dal.dataobject.base;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.*;
 /**
 * 账户条款 DO
@@ -54,6 +56,19 @@ public class AccountDO extends BusinessBaseDO {
     */
     @TableField("TAX_NUM")
     private String taxNumber;
+
+    /**
+     * 是否启用
+     */
+    @TableField("IS_ENB")
+    private String isEnable;
+
+    @TableField("CSTM_NUM")
+    private String customerNumber;
+
+    @TableField("CSTM_NAME")
+    private String customerName;
+
     /**
     * 公司编号
     */

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java

@@ -33,7 +33,7 @@ public class CompanyRelaDeptDO {
     // 公司名称
     private String companyName;
     // 部门编码
-    private String deptNumber;
+    private String companyNumber;
     // 负责人id
     private String leaderUserId;
     // 是否公司

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java

@@ -100,4 +100,10 @@ public class ContactDO extends BusinessBaseDO {
     @TableField("UPDATER_NAME")
     private String updaterName;
 
+    @TableField("CSTM_NUM")
+    private String customerNumber;
+
+    @TableField("CSTM_NAME")
+    private String customerName;
+
 }