Merge branch 'dev' into pre

zhongzheng-api/src/main/java/com/zhongzheng/controller/mock/MockApplyController.java

@@ -146,6 +146,8 @@ public class MockApplyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:apply:list')")
     @GetMapping("/listMockLive")
     public TableDataInfo<MockMajorSubjectVo> listMockLive(MockApplyQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         Integer pageNum = 0;
         Integer pageSize = 0;
         if (Validator.isNotEmpty(bo.getPageNum()) && Validator.isNotEmpty(bo.getPageSize())) {