Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

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

@@ -139,11 +139,11 @@
                    }
                }
                if (coupon.getPublisherType() == 2) {
                    CityManager cityManager = cmgrClient.queryCityManagerById(tStore.getCityManagerId());
                    if (ToolUtil.isNotEmpty(cityManager)) {
                        tStore.setProvince(tStore.getProvince() + tStore.getCity());
                        tStore.setPhone(cityManager.getName() + "-" + cityManager.getPhone());
                    }
                    User byId = userService.getById(tStore.getStoreStaffId());

                    tStore.setProvince(tStore.getProvince() + tStore.getCity());
                        tStore.setPhone(byId.getName() + "-" + byId.getPhone());

                }
            }
        }