Merge remote-tracking branch 'origin/master'

fuliqi

2023-11-30 e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0

 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java

@@ -5,7 +5,7 @@
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.controller.video.common.util.UtilNumber;
import com.ycl.common.util.UtilNumber;
import com.ycl.dto.store.UmsStoreInfoParam;
import com.ycl.entity.store.StoreInfo;
import com.ycl.entity.store.StoreScore;
@@ -52,8 +52,10 @@
    @LogSave(operationType = "门店管理", contain = "查询门店")
    public CommonResult<CommonPage<StoreInfoVO>> list(@RequestParam(value = "keyword", required = false) String keyword,
                                                      @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
                                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
        Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum);
                                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "status", required = false) String status
    ) {
        Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum,status);
        return CommonResult.success(CommonPage.restPage(storeInfoPage));
    }

@@ -86,6 +88,7 @@
                .description(umsStoreInfoParam.getDescription())
                .videoId(umsStoreInfoParam.getRelationVideo())
                .storeScore(100.0)
                .status(umsStoreInfoParam.getStatus())
                .build();
        boolean success = storeInfoService.save(storeInfo);
        if (success) {