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

jiangping

2025-02-08 75ac3d5acdd448f063a3c307b4c733e37b4fc04f

 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);