Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

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

@@ -47,7 +47,7 @@
     */
    @RequestMapping("/coupon_add")
    public String memberCouponAdd() {
        return PREFIX + "coupon_add.html";
        return PREFIX + "TCouponAdd.html";
    }

    /**
@@ -65,9 +65,7 @@
        ofSearch.setUserPopulation(userPopulation);
        ofSearch.setStatus(status);
        ofSearch.setState(state);
        List<Map<String, Object>> mapList = client.getCouponListOfSearch(ofSearch);
        page.setRecords(mapList);
        return page.getRecords();
        return client.getCouponListOfSearch(ofSearch);
    }