Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-22 2fe62e274ec26766f58f8069a6f09edb24cede6b

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java

@@ -228,7 +228,7 @@
    @PostMapping("/order/page")
    public R page(@RequestBody @Validated PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
        //pageComShopOrderSearchDTO.setUserId(this.getUserId());
        //ClazzUtils.setIfStringIsEmpty(pageComShopOrderSearchDTO);
        ClazzUtils.setIfStringIsEmpty(pageComShopOrderSearchDTO);
        return communityService.pageShopOrder(pageComShopOrderSearchDTO);
    }