From 279df6a13a6889020d27e391069879887142b755 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 09 六月 2023 21:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
index 8421a62..6c2735a 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
@@ -228,10 +228,11 @@
}
tBranchOffice.setDistrictName(area.getName());
tBranchOffice.setDistrictCode(area.getCode());
- }else {
+ }
+ /*else {
tBranchOffice.setDistrictName(city.getName());
tBranchOffice.setDistrictCode(city.getCode());
- }
+ }*/
// 通过省市查询代理商
List<TAgent> tAgent = tAgentMapper.selectList(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode())
--
Gitblit v1.7.1