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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java

@@ -504,7 +504,7 @@
        if (UserExt.getUser().getObjectType()==3){
            if (StringUtils.hasLength(sites)){
                useScope = 4;
                sites="";
                storeIds="";
                pointsMerchandise.setUseScope(4);
            }else{
                useScope = 3;