Merge remote-tracking branch 'origin/dev_1.1.1' into dev_1.1.1

sop-api/src/main/java/com/qmth/sop/server/api/SysCustomController.java

@@ -143,6 +143,7 @@ public class SysCustomController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysCustom.class)})
     public Result list(@ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Boolean enable,
                        @ApiParam(value = "类型", required = false) @RequestParam(required = false) ProductTypeEnum type) {
-        return ResultUtil.ok(sysCustomService.list(new QueryWrapper<SysCustom>().lambda().eq(Objects.nonNull(enable), SysCustom::getEnable, enable).eq(Objects.nonNull(type), SysCustom::getType, type)));
+//        sysCustomService.list(new QueryWrapper<SysCustom>().lambda().eq(Objects.nonNull(enable), SysCustom::getEnable, enable).eq(Objects.nonNull(type), SysCustom::getType, type))
+        return ResultUtil.ok(sysCustomService.listCustomer(enable, type));
     }
 }