zxc
|
08a5630c65
|
公共服务图层，城市管理图层新增联系人和联系电话字段
|
3 years ago |
|
zxc
|
8ca9f38655
|
公共服务图层，城市管理图层新增联系人和联系电话字段
|
3 years ago |
|
zxc
|
0eeb3edec7
|
公共服务图层，城市管理图层新增联系人和联系电话字段
|
3 years ago |
jianjun
|
e4e749eccb
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
2a1bc01040
|
居民导出优化
|
3 years ago |
|
zxc
|
6f6bb9513a
|
log级别修改
|
3 years ago |
|
zxc
|
2dc4b826a9
|
锁获取修改
|
3 years ago |
|
zxc
|
1f227799c3
|
刷新component_access_token加锁
|
3 years ago |
|
zxc
|
0f4c7b659f
|
刷新小程序token加锁
|
3 years ago |
yinzuomei
|
1d29464b96
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
4ba963ea5f
|
内部备注可空
|
3 years ago |
|
yinzuomei
|
773bd48cc1
|
Merge remote-tracking branch 'origin/dev_new_menu'
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
3 years ago |
|
jianjun
|
495c698ba5
|
项目分类错误
|
3 years ago |
|
jianjun
|
755372c4f5
|
Merge remote-tracking branch 'remotes/origin/bugfix/teamB_shuangshi'
|
3 years ago |
zhaoqifeng
|
ec064f9631
|
双实居民录入pidsbug修改
|
3 years ago |
wanggongfeng
|
5445aac167
|
人防统计BUG
|
3 years ago |
Jackwang
|
8f0c53b421
|
福利人员导出调整
|
3 years ago |
|
jianjun
|
c2cdccb738
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
d0b1f89461
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
38f4858ca5
|
打印下日志
|
3 years ago |
|
wanggongfeng
|
e2450dba13
|
Merge branch 'feature/dev_union'
|
3 years ago |
|
wanggongfeng
|
daa94615bd
|
Merge branch 'feature/dev_union'
|
3 years ago |
zhangyuan
|
802222275f
|
回显客户名称
|
3 years ago |
|
zhangyuan
|
0ad8be25e9
|
bug
|
3 years ago |
|
wanggongfeng
|
13e122a348
|
组装客户树
|
3 years ago |
|
zhangyuan
|
ca4a0f97ba
|
bug
|
3 years ago |
|
zhangyuan
|
4c0fceac73
|
补充完善
|
3 years ago |
|
zhangyuan
|
6f0f4f2ea9
|
完善客户树
|
3 years ago |
|
zhangyuan
|
abc71d9299
|
bug修复
|
3 years ago |
|
zhangyuan
|
c83b381009
|
bug
|
3 years ago |
|
zhangyuan
|
02077403e3
|
bug修复
|
3 years ago |
|
zhangyuan
|
53f0aebd11
|
update
|
3 years ago |
|
jianjun
|
d2a87b6a57
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
a7cf616705
|
更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
|
3 years ago |
|
jianjun
|
2fc4c03955
|
更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
|
3 years ago |
|
jianjun
|
4944932d09
|
更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
|
3 years ago |
|
jianjun
|
db25cf00b2
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
cb880d510f
|
注掉更新房屋内的居民数 这个压力太大 待优化
|
3 years ago |
|
jianjun
|
68466fd760
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
73e1d4fa01
|
更新小区时需要更新对应的小区里的居民
|
3 years ago |
|
yinzuomei
|
c577c1696b
|
listresi，groupby换下位置
|
3 years ago |
|
jianjun
|
845a89b45f
|
更新小区时需要更新对应的小区里的居民
|
3 years ago |
|
jianjun
|
74ee47f64e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
ef48136aea
|
更新居民的网格id 是小区修改所属网格触发
|
3 years ago |
|
jianjun
|
074470bdd6
|
更新居民的网格id 是小区修改所属网格触发
|
3 years ago |
|
jianjun
|
1d8491f1fd
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
3 years ago |
|
jianjun
|
ed89bff32e
|
更新居民的网格id 是小区修改所属网格触发
|
3 years ago |
wangxianzhang
|
a99e1e8703
|
Merge branches 'dev_bugfix_ljj' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
56e60425a0
|
-
|
3 years ago |
|
wangxianzhang
|
ea663d7deb
|
修改：【小区编辑】【居民编辑】【居民导入】增加客户级别分布式锁，不能同时进行
|
3 years ago |
