Althars123 4 gadi atpakaļ
vecāks
revīzija
03eda576cf

+ 3 - 2
hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -30,7 +30,7 @@ import com.miaxis.common.core.page.ResponsePageInfo;
  */
 @RestController
 @RequestMapping("/user/info")
-@Api(tags={"【用户信息】Controller"})
+@Api(tags={"【普通用户信息】Controller"})
 public class UserInfoController extends BaseController{
     @Autowired
     private IUserInfoService userInfoService;
@@ -47,7 +47,8 @@ public class UserInfoController extends BaseController{
     })
     public ResponsePageInfo<UserInfo> list(@ModelAttribute UserInfo userInfo){
         startPage();
-        List<UserInfo> list = userInfoService.selectUserInfoList(userInfo);
+//        List<UserInfo> list = userInfoService.selectUserInfoList(userInfo);
+        List<UserInfo> list = userInfoService.list();
         return toResponsePageInfo(list);
     }
 

+ 6 - 6
hzgzpt-admin/src/main/resources/application.yml

@@ -45,7 +45,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.hzgzpt: @logging.level@
+    com.miaxis: @logging.level@
     org.springframework: warn
 
 # Spring配置
@@ -54,7 +54,7 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles: 
+  profiles:
     active: @profiles.active@
   # 文件上传
   servlet:
@@ -77,7 +77,7 @@ token:
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期(默认30分钟)
     expireTime: 30
-  
+
 # MyBatis配置
 # https://baomidou.com/config/
 mybatis-plus:
@@ -167,11 +167,11 @@ mybatis-plus:
       selectStrategy: NOT_NULL
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   reasonable: true
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Swagger配置
 swagger:
@@ -181,7 +181,7 @@ swagger:
   pathMapping: /
 
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接(多个用逗号分隔)

+ 2 - 1
hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/UserInfo.java

@@ -4,6 +4,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
@@ -23,7 +24,7 @@ import lombok.Data;
 @Data
 @TableName("user_info")
 @ApiModel(value = "UserInfo", description = "用户信息对象 user_info")
-public class UserInfo extends BaseEntity{
+public class UserInfo extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */