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

aix

2024-07-30 249d316e0b8c79b71b779b5716bc488e1d08a9b3

 src/main/java/com/dji/sample/patches/controller/PatchesController.java

@@ -70,7 +70,7 @@
                                                        @RequestParam(name = "xmc", required = false) String xmc,
                                                        @RequestParam(name = "investigate", required = false) Integer investigate,
                                                        @RequestParam(name = "dkmj", required = false) Double dkmj,
                                                        @RequestParam(name = "isPlan",required = false) Integer isPlan
                                                        @RequestParam(name = "isPush",required = false) Integer isPush
                                                        ) {
        fileService.getNoaddFile();
        //调用service分页查询
@@ -84,7 +84,7 @@
                .xmc(xmc)
                .investigate(investigate)
                .dkmj(dkmj)
                .isPlan(isPlan)
                .isPush(isPush)
                .build();
        PaginationData<LotInfo> data = getPatchesService.limitGet(param);
        return ResponseResult.success(data);