改造租户

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java

@@ -88,7 +88,7 @@ public class SysTenant extends BaseEntity {
     private String companyType;
 
     @Schema(description = "经营类型")
-    private String businessTypes;
+    private List<String> businessTypes;
 
     @Schema(description = "相关资质名称及附件")
     private String relatedimg;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java

@@ -68,7 +68,7 @@ public class SysTenantExtendBo {
     private String companyType;
 
     @Schema(description = "经营类型")
-    private String businessTypes;
+    private List<String> businessTypes;
 
     @Schema(description = "相关资质名称及附件")
     private String relatedimg;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java

@@ -1,13 +1,16 @@
 package org.dromara.system.domain.dto;
 
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class TenantDTO {
@@ -68,7 +71,7 @@ public class TenantDTO {
     private String companyType;
 
     @Schema(description = "经营类型")
-    private String businessTypes;
+    private List<String> businessTypes;
 
     @Schema(description = "相关资质名称及附件")
     private String relatedimg;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java

@@ -2,16 +2,10 @@ package org.dromara.system.domain.vo;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysTenant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -73,12 +67,10 @@ public class SysTenantVo implements Serializable {
     private LocalDateTime joinTime;
 
     @Schema(description = "营业执照附件")
-    @TableField(typeHandler = JacksonTypeHandler.class)
+    private String attachmentimg;
-    private List<String> attachmentimg;
 
     @Schema(description = "推广附件")
-    @TableField(typeHandler = JacksonTypeHandler.class)
+    private String promoteListimg;
-    private List<String> promoteListimg;
 
     @Schema(description = "营业执照有效期")
     private LocalDateTime expireTime;
@@ -90,12 +82,10 @@ public class SysTenantVo implements Serializable {
     private String companyType;
 
     @Schema(description = "经营类型")
-    @TableField(typeHandler = JacksonTypeHandler.class)
     private List<String> businessTypes;
 
     @Schema(description = "相关资质名称及附件")
-    @TableField(typeHandler = JacksonTypeHandler.class)
+    private String relatedimg;
-    private List<String> relatedimg;
 
     @Schema(description = "店铺id")
     private Long storeId;
@@ -107,8 +97,7 @@ public class SysTenantVo implements Serializable {
     private String idCardType;
 
     @Schema(description = "证件图片")
-    @TableField(typeHandler = JacksonTypeHandler.class)
+    private String certificateimg;
-    private List<String> certificateimg;
 
     @Schema(description = "负责人姓名")
     private String personName;
@@ -163,8 +152,7 @@ public class SysTenantVo implements Serializable {
     private String contractYear;
 
     @Schema(description = "签约附件")
-    @TableField(typeHandler = JacksonTypeHandler.class)
+    private String contractAttachmentimg;
-    private List<String> contractAttachmentimg;
 
     @Schema(description = "签约状态")
     private String signStatus;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -121,7 +121,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
     }
 
     /**
-     * 新增租户（拆分到两个表）
+     * 新增租户
      */
     @Override
     @Transactional(rollbackFor = Exception.class)

ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/wechat/WechatPayConfig.java

@@ -19,7 +19,7 @@ public class WechatPayConfig {
     private String mchId;
     private String mchSerialNo;
     private String apiV3Key;
-    private String privateKeyPath; // 支持 classpath: 或 file: 前缀
+    private String privateKeyPath;
     private String transferNotifyUrl;
     private String appId;
     private String secret;