diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 27de286..6dd5d6d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -140,6 +140,14 @@ tenant:
- sys_user_role
- sys_client
- sys_oss_config
+ - sys_oss
+ - m_counselor
+ - m_counselor_experience
+ - m_counselor_qualification
+ - m_reservation_day
+ - m_reservation_order
+ - m_reservation_time
+ - m_score_record
# MyBatisPlus配置
# https://baomidou.com/config/
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java
index c14f8e3..f9c9855 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java
@@ -1,9 +1,10 @@
package org.dromara.scale.controller.wx;
-import jakarta.validation.constraints.NotBlank;
+import cn.hutool.core.util.ObjectUtil;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.Map;
/**
*
TODO
@@ -38,6 +40,7 @@ public class WxScaleController extends BaseController {
*/
@GetMapping("/pageList")
public TableDataInfo pageList(SysScaleBo bo, PageQuery pageQuery) {
+ bo.setOrderBy("num");
return sysScaleService.queryPageList(bo, pageQuery);
}
@@ -45,8 +48,11 @@ public class WxScaleController extends BaseController {
* 查询心理测评量列表,默认展示两条数据
*/
@GetMapping("/list")
- public R> list(@NotBlank(message = "类型不能为空") String scaleType) {
- return R.ok(sysScaleService.queryWxList(scaleType));
+ public R