lichao
|
f76b9760a9
|
社区列表服务器开小差
|
3 years ago |
|
lichao
|
5507b18e57
|
Merge branch 'yantai_zhengwu_master' into dev
|
3 years ago |
|
lichao
|
fd3fb8a513
|
获取区县级下拉
|
3 years ago |
|
lichao
|
c0d9dac17d
|
社区列表
|
3 years ago |
yinzuomei
|
0a2d4fd4ae
|
九小场所列表查询调整
|
3 years ago |
|
lichao
|
f0283b3556
|
Merge branch 'yantai_zhengwu_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
|
3 years ago |
|
lichao
|
86671d4322
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
|
3 years ago |
|
lichao
|
ec089412f6
|
社区列表
|
3 years ago |
|
lichao
|
779b605a04
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
lichao
|
0d37f89d24
|
社区列表
|
3 years ago |
|
yinzuomei
|
b6884fadc9
|
bingtu
|
3 years ago |
曲树通
|
cfb16c68ef
|
Merge branch 'yantai_zhengwu_master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
lichao
|
8a68f79082
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
lichao
|
bd4f4e830c
|
社区数量统计
|
3 years ago |
|
曲树通
|
774d1ab2fa
|
补充
|
3 years ago |
|
曲树通
|
c7a88c15a0
|
补充
|
3 years ago |
|
yinzuomei
|
1c32c8a3da
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
3 years ago |
|
yinzuomei
|
b4421edf19
|
固定住排序
|
3 years ago |
|
lichao
|
5cb3ff9c44
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
lichao
|
e7d4e4a302
|
返回下级组织数量
|
3 years ago |
|
曲树通
|
fca2ddb135
|
补充分页
|
3 years ago |
wxz
|
b9b5ec853d
|
Merge branch 'master' into yantai_zhengwu_master
|
3 years ago |
|
wxz
|
64e0edc54c
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
lichao
|
09e628d136
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
|
3 years ago |
|
lichao
|
0916cce841
|
组织开通
|
3 years ago |
|
yinzuomei
|
e8b16f1d91
|
街镇返回区县
|
3 years ago |
|
曲树通
|
75d0c88306
|
补充
|
3 years ago |
|
曲树通
|
7c7ff00420
|
调整
|
3 years ago |
|
wxz
|
ec1c4dba4b
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
wxz
|
2f22870337
|
代码写法调整，不重要
|
3 years ago |
|
yinzuomei
|
0cf3af35d8
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
3 years ago |
|
yinzuomei
|
66d543e9a0
|
注释
|
3 years ago |
|
曲树通
|
944b8a7a51
|
补充
|
3 years ago |
|
wxz
|
2c00e196af
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
wxz
|
e731e686b8
|
fix:解决居民信息多选导致的一系列问题。。。。头发掉光了
|
3 years ago |
|
曲树通
|
4f43d087e1
|
导出
|
3 years ago |
|
wxz
|
01117e768b
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
wxz
|
f18c93a268
|
Merge branch 'wxz_bug_fix' into dev
|
3 years ago |
|
wxz
|
4304f58fae
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
曲树通
|
1f80269374
|
Merge branch 'yantai_zhengwu_master' into dev
|
3 years ago |
|
wxz
|
e202417a9d
|
fix：居民信息导出
|
3 years ago |
|
曲树通
|
c092c37e15
|
活跃度统计计算
|
3 years ago |
|
yinzuomei
|
d1b3ecdc45
|
orgId
|
3 years ago |
|
yinzuomei
|
9952976aa6
|
and
|
3 years ago |
|
yinzuomei
|
e3b2c9f302
|
街镇、区县
|
3 years ago |
|
wxz
|
89cb57abfa
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
yinzuomei
|
20e05cc072
|
社区调整
|
3 years ago |
|
wxz
|
14fa4f64a1
|
fix：初始化"指挥调度"的时候，将sql中缺少的字段补全
|
3 years ago |
|
wxz
|
cbe8c7dc47
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
曲树通
|
afa76e71c5
|
Merge branch 'yantai_zhengwu_master' into dev
|
3 years ago |
