Merge remote-tracking branch 'origin/master'

zzjs-admin/src/main/java/com/miaxis/system/controller/gzpt/GzptUserInfoController.java → zzjs-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptUserInfoController.java

@@ -1,4 +1,4 @@
-package com.miaxis.system.controller.gzpt;
+package com.miaxis.app.controller.gzpt;
 
 
 import com.miaxis.common.core.controller.BaseController;
@@ -10,7 +10,6 @@ import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
-import com.miaxis.system.dto.system.UserInfoDTO;
 import com.miaxis.user.service.IUserInfoService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

zzjs-admin/src/main/java/com/miaxis/system/controller/gzpt/GzptExamQuestionController.java

@@ -1,24 +0,0 @@
-package com.miaxis.system.controller.gzpt;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 考试题库 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2021-03-09
- */
-@RestController
-@Api(tags = "【小程序-考试题库】")
-@RequestMapping("/gzpt-exam-question")
-public class GzptExamQuestionController {
-
-}
-