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/TGateController.java

@@ -250,7 +250,7 @@
                        .ne("state", 3));
            }else{
                tStores = storeService.list(new QueryWrapper<TStore>()
                        .eq("operatorId", 0)
                        .eq("operatorId", byId.getOperatorId())
                        .eq("type", 2)
                        .ne("state", 3));
            }