Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-10-25 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxProductAttributeAction.java

@@ -28,9 +28,9 @@
    @Autowired
    private ShopProductAttributeDao shopProductAttributeDao;

    @RequestMapping("/getByCode/{shopId}/{attrCode}")
    @RequestMapping("/getByCode/{attrCode}")
    @ResponseBody
    public AjaxResult getProductAttributeByCode(@PathVariable("shopId") Long shopId, @PathVariable("attrCode") String attrCode){
    public AjaxResult getProductAttributeByCode(@PathVariable("attrCode") String attrCode){

        if(!StringUtils.isNotBlank(attrCode)){
            return  new AjaxResult(AjaxResult.STATUS_FAIL,"属性编码不能为空");