wangxianzhang
|
c6dbfcf845
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
a0ab64e5e0
|
job RequestAttributes为空的问题
|
4 years ago |
zxc
|
d224231892
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3bae58d08a
|
Merge remote-tracking branch 'origin/dev_import' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
|
4 years ago |
|
zxc
|
931338532b
|
社区自组织，党员风采微调
|
4 years ago |
|
zxc
|
bd2101d501
|
小区，楼宇，房屋导入微调
|
4 years ago |
zhaoqifeng
|
128e054402
|
Merge branch 'dev_shuju_task' into develop
|
4 years ago |
|
zhaoqifeng
|
9d281386b6
|
平阴三个街道上传项目统计数据校验
|
4 years ago |
|
zxc
|
5fa9f37de5
|
Merge branch 'dev_test_async' into develop
|
4 years ago |
|
zxc
|
e5ed398525
|
测试async
|
4 years ago |
|
zxc
|
9995860e87
|
Merge branch 'dev_test_async' into develop
|
4 years ago |
|
zxc
|
31cd47027a
|
测试async
|
4 years ago |
jianjun
|
120a4291ed
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
3e0a76a660
|
去掉没用的
|
4 years ago |
|
zxc
|
d886fa7c63
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
54bcf6d3d5
|
添加组织Id和网格ID
|
4 years ago |
|
zxc
|
531047ad0f
|
测试async
|
4 years ago |
|
zxc
|
b1d7e0e783
|
Merge branch 'dev_test_async' into develop
|
4 years ago |
|
zxc
|
f5459c41d7
|
测试async
|
4 years ago |
|
zxc
|
748127115e
|
Merge branch 'dev_test_async' into develop
|
4 years ago |
|
zxc
|
cf24e1cd79
|
测试async
|
4 years ago |
|
zxc
|
1e878d0f53
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
61a0679cd9
|
加了个状态和备注
|
4 years ago |
|
wangxianzhang
|
1a59183a56
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
zxc
|
4a5044fd9b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
9c41853fae
|
查询房屋信息
|
4 years ago |
|
wangxianzhang
|
5ca90bfc07
|
调试
|
4 years ago |
|
wangxianzhang
|
66f22172e8
|
调试
|
4 years ago |
|
wangxianzhang
|
c9ae0d499f
|
调试
|
4 years ago |
|
wangxianzhang
|
429555293f
|
调试
|
4 years ago |
|
wangxianzhang
|
532904489a
|
调试
|
4 years ago |
|
wangxianzhang
|
21d6090c7b
|
调试
|
4 years ago |
|
wangxianzhang
|
8d4657f60e
|
临时解决异步情况下，主线程结束，子线程request header被清空的bug
|
4 years ago |
|
wangxianzhang
|
df768ceddc
|
调试：居民导入
|
4 years ago |
|
wangxianzhang
|
f128557851
|
调试：居民导入
|
4 years ago |
|
wangxianzhang
|
90c1ab458e
|
调试：居民导入
|
4 years ago |
|
wangxianzhang
|
7791c3285c
|
调试：居民导入
|
4 years ago |
|
wangxianzhang
|
054ba84f1d
|
调试：居民导入
|
4 years ago |
|
wangxianzhang
|
e03798ac3e
|
调试：居民导入
|
4 years ago |
|
wangxianzhang
|
dcf774c5aa
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
e22fb90726
|
居民信息导入：增加调试日志
|
4 years ago |
|
wangxianzhang
|
cf0c1ca254
|
居民信息导入：增加调试日志
|
4 years ago |
|
wangxianzhang
|
81a007a744
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
zxc
|
1cf61b8e72
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
zxc
|
5f5053af21
|
去掉Async
|
4 years ago |
|
jianjun
|
327c3fcec8
|
去掉日志
|
4 years ago |
|
wangxianzhang
|
2389fa599b
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
yinzuomei
|
542e405e24
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
676f5c0c79
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
51be3af9fe
|
去掉注解
|
4 years ago |
