Merge remote-tracking branch 'origin/master'

nickchange

2023-10-16 6593a67fdfb688c70365b419c0e9658c690524b5

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java

@@ -236,8 +236,11 @@
        ofSearch.setState(state);
        ofSearch.setCityCode(cityCode);
        ofSearch.setStoreId(storeId);
        return client.getCouponListOfSearch(ofSearch);
        return client.getCouponListOfSearch1(ofSearch);
    }



    @RequestMapping(value = "/listRecord")
    @ResponseBody
    public Object listRecord(Integer id,String name, Integer type, String phone) {