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

jiaosong

2023-09-21 2193f1e8240e2a0ed5900dddc6347a1d9db081cf

 server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java

@@ -525,7 +525,10 @@
            return;
        }
        String attrName = attr.substring(0,index);
        if(StringUtils.isBlank(attrName) || StringUtils.equals(attrName, "商品名称") || StringUtils.equals(attrName, "商品编号")){
        if(StringUtils.isBlank(attrName)
                || StringUtils.equals(attrName, "商品名称")
                || StringUtils.equals(attrName, "商品编号")
                || StringUtils.equals(attrName, "店铺")){
            return;
        }
        String val = attr.substring(index+1);