Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-24 9e8ce689c89c4b03bfc67a60d7da13a7d593725a

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

@@ -335,7 +335,6 @@
            if(yyId==null || type==1){
                yyId=0;
            }

            if(yyId!=0) {
                List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
                if(list1.size()>0){
@@ -388,17 +387,20 @@
            }
            user.setAccount(userPhone);
            user.setName(userName);
            user.setRoleid("2");
            user.setRoleid("3");
            user.setPhone(userPhone);
            user.setPassword(SecureUtil.md5("a123456"));
            userMapper.insert(user);
            user.setObjectType(3);
            user.setStatus(1);
            tStore.setStoreStaffId(user.getId());
                tStore.setLon(lon);
                tStore.setLat(lat);

            storeService.save(tStore);


            user.setObjectId(tStore.getId());
            userMapper.insert(user);



            ArrayList<StoreConfig> storeConfigs = new ArrayList<>();