Merge remote-tracking branch 'origin/master'

liujie

2023-10-31 1c08cdb19aa0531dc77665dbbde052133dff9ceb

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

@@ -1170,6 +1170,13 @@
            siteBooking.setCity(byId.getCity());
            siteBooking.setCityCode(byId.getCityCode());
        }
        if (UserExt.getUser().getObjectType() == 3){
            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            siteBooking.setProvince(byId.getProvince());
            siteBooking.setProvinceCode(byId.getProvinceCode());
            siteBooking.setCity(byId.getCity());
            siteBooking.setCityCode(byId.getCityCode());
        }

        siteClient.addSiteBooking(siteBooking);
        System.out.println("================="+siteBooking);