wxz
|
f18c93a268
|
Merge branch 'wxz_bug_fix' into dev
|
2 years ago |
|
wxz
|
4304f58fae
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
曲树通
|
1f80269374
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
曲树通
|
cfb16c68ef
|
Merge branch 'yantai_zhengwu_master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
lichao
|
8a68f79082
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
bd4f4e830c
|
社区数量统计
|
2 years ago |
|
曲树通
|
774d1ab2fa
|
补充
|
2 years ago |
|
曲树通
|
c7a88c15a0
|
补充
|
2 years ago |
yinzuomei
|
1c32c8a3da
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
b4421edf19
|
固定住排序
|
2 years ago |
|
lichao
|
5cb3ff9c44
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
e7d4e4a302
|
返回下级组织数量
|
2 years ago |
|
曲树通
|
fca2ddb135
|
补充分页
|
2 years ago |
|
wxz
|
b9b5ec853d
|
Merge branch 'master' into yantai_zhengwu_master
|
2 years ago |
|
wxz
|
64e0edc54c
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 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
|
2 years ago |
|
lichao
|
0916cce841
|
组织开通
|
2 years ago |
|
yinzuomei
|
e8b16f1d91
|
街镇返回区县
|
2 years ago |
|
曲树通
|
75d0c88306
|
补充
|
2 years ago |
|
曲树通
|
7c7ff00420
|
调整
|
2 years ago |
|
wxz
|
ec1c4dba4b
|
Merge branch 'wxz_bug_fix'
|
2 years ago |
|
wxz
|
2f22870337
|
代码写法调整，不重要
|
2 years ago |
|
yinzuomei
|
0cf3af35d8
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
66d543e9a0
|
注释
|
2 years ago |
|
曲树通
|
944b8a7a51
|
补充
|
2 years ago |
|
wxz
|
2c00e196af
|
Merge branch 'wxz_bug_fix'
|
2 years ago |
|
wxz
|
e731e686b8
|
fix:解决居民信息多选导致的一系列问题。。。。头发掉光了
|
2 years ago |
|
曲树通
|
4f43d087e1
|
导出
|
2 years ago |
|
wxz
|
e202417a9d
|
fix：居民信息导出
|
2 years ago |
|
曲树通
|
c092c37e15
|
活跃度统计计算
|
2 years ago |
|
yinzuomei
|
d1b3ecdc45
|
orgId
|
2 years ago |
|
yinzuomei
|
9952976aa6
|
and
|
2 years ago |
|
yinzuomei
|
e3b2c9f302
|
街镇、区县
|
2 years ago |
|
wxz
|
89cb57abfa
|
Merge branch 'wxz_bug_fix'
|
2 years ago |
|
yinzuomei
|
20e05cc072
|
社区调整
|
2 years ago |
|
wxz
|
14fa4f64a1
|
fix：初始化"指挥调度"的时候，将sql中缺少的字段补全
|
2 years ago |
|
wxz
|
cbe8c7dc47
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
曲树通
|
afa76e71c5
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
wxz
|
9edb6731cc
|
Merge branch 'wxz_bug_fix' into dev
|
2 years ago |
|
wxz
|
bc90dcd82d
|
fix：居民信息导出-gridIds
|
2 years ago |
|
yinzuomei
|
d4525b4e53
|
柱子
|
2 years ago |
|
wxz
|
6f54f21539
|
Merge branch 'wxz_bug_fix' into dev
|
2 years ago |
|
wxz
|
a4fe021211
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
yinzuomei
|
e9a746f8fc
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
曲树通
|
095631aa9a
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
wxz
|
c6674024d8
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
yinzuomei
|
666d0a6a69
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
曲树通
|
47f52b8b0c
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
曲树通
|
13043a967b
|
补充
|
2 years ago |
|
曲树通
|
00af4e8664
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
