Merge branch 'developer' into alpha

Helius

2022-03-10 6678c4c0f42d25e0a63416f4ac5dda3cd66627a7

 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,"属性编码不能为空");