添加用户地址等信息

ruoyi-admin/src/main/resources/application.yml

@@ -149,6 +149,7 @@ tenant:
     - m_reservation_order
     - m_reservation_time
     - m_score_record
+    - sys_warn_config
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

ruoyi-common/ruoyi-common-wxlogin/src/main/java/org/dromara/common/wxlogin/config/WxMaConfiguration.java

@@ -14,9 +14,9 @@ import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.error.WxRuntimeException;
 import org.dromara.common.wxlogin.config.properties.WxMaProperties;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 import java.io.File;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 @Slf4j
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties(WxMaProperties.class)
 public class WxMaConfiguration {
     private final WxMaProperties properties;

ruoyi-common/ruoyi-common-wxlogin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.dromara.common.wxlogin.config.WxMaConfiguration

ruoyi-common/ruoyi-common-wxpay/src/main/java/org/dromara/common/wxpay/config/WxPayConfiguration.java

@@ -6,6 +6,7 @@ import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.common.wxpay.config.properties.WxPayProperties;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -15,7 +16,7 @@ import org.springframework.context.annotation.Lazy;
 /**
  * @author Binary Wang
  */
-//@Configuration
+@AutoConfiguration
 @ConditionalOnClass(WxPayService.class)
 @EnableConfigurationProperties(WxPayProperties.class)
 @AllArgsConstructor

ruoyi-common/ruoyi-common-wxpay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.dromara.common.wxpay.config.WxPayConfiguration

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java

@@ -105,7 +105,7 @@ public class WarnController extends BaseController {
     }
 
     /**
-     * 修改预警配置
+     * 查看预警配置
      */
     @SaCheckPermission("warn:config:list")
     @GetMapping("/config/list")

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

@@ -49,6 +49,11 @@ public class SysUser extends TenantEntity {
      */
     private String userType;
 
+    /**
+     * 家庭住址
+     */
+    private String address;
+
     /**
      * 用户邮箱
      */

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

@@ -50,11 +50,18 @@ public class SysUserBo extends BaseEntity {
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
     private String nickName;
 
+    private String openId;
+
     /**
      * 用户类型（sys_user系统用户）
      */
     private String userType;
 
+    /**
+     * 家庭住址
+     */
+    private String address;
+
     /**
      * 用户邮箱
      */

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

@@ -48,18 +48,23 @@ public class SysUserVo implements Serializable {
      */
     private String userName;
 
-    private String openId;
-
     /**
      * 用户昵称
      */
     private String nickName;
 
+    private String openId;
+
     /**
      * 用户类型（sys_user系统用户）
      */
     private String userType;
 
+    /**
+     * 家庭住址
+     */
+    private String address;
+
     /**
      * 用户邮箱
      */