Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-19 15f8fd41181887bf9375b8b1c910637212cf2557

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.PageGroup;
import com.panzhihua.common.interfaces.ShopOperLog;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -25,6 +26,7 @@
@Slf4j
@RestController
@RequestMapping("/goods")
@Api(tags = {"商家后台", "商品管理"})
public class GoodsApi extends BaseController {

    @Resource