Merge remote-tracking branch 'origin/dev-czh' into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java

@@ -31,10 +31,12 @@ public class CodeConfigController extends BaseController {
     @GetMapping
     public GenericsAjaxResult<Page<CodeConfig>> queryByPage(@RequestParam("page") int page,
                                                             @RequestParam("size") int size,
-                                                            @RequestParam(value = "code_repo_name", required = false) String codeRepoName) {
+                                                            @RequestParam(value = "code_repo_name", required = false) String codeRepoName,
+                                                            @RequestParam(value = "code_repo_vis", required = false)Integer codeRepoVis) {
         PageRequest pageRequest = PageRequest.of(page, size);
         CodeConfig codeConfig = new CodeConfig();
         codeConfig.setCodeRepoName(codeRepoName);
+        codeConfig.setCodeRepoVis(codeRepoVis);
         return genericsSuccess(this.codeConfigService.queryByPage(codeConfig, pageRequest));
     }
 
@@ -45,8 +47,8 @@ public class CodeConfigController extends BaseController {
      * @return 单条数据
      */
     @GetMapping("{id}")
-    public ResponseEntity<CodeConfig> queryById(@PathVariable("id") Long id) {
-        return ResponseEntity.ok(this.codeConfigService.queryById(id));
+    public GenericsAjaxResult<CodeConfig> queryById(@PathVariable("id") Long id) {
+        return genericsSuccess(this.codeConfigService.queryById(id));
     }