wangxianzhang
|
c9a0ed281b
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
yinzuomei
|
bc06152ae4
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
11042644d3
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
f410d93eec
|
Merge remote-tracking branch 'origin/dev_grid_active_syc' into develop
|
4 years ago |
|
yinzuomei
|
0f52380596
|
网格活跃度统计改为新方法。 xlsx格式
|
4 years ago |
jianjun
|
c124b75330
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
c5ccf7e380
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
97850812db
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
ca9e3c07b1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
65d9931686
|
关闭监控页面
|
4 years ago |
|
wangxianzhang
|
caae7f60a1
|
ttl改造完成，待测试
|
4 years ago |
zhaoqifeng
|
9c6f5b5e1d
|
Merge branch 'dev_shuju_task' into develop
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/DingDingRobotConstant.java
|
4 years ago |
|
zhaoqifeng
|
75ca49624c
|
平阴项目统计数据校验
|
4 years ago |
zxc
|
8dc4023e10
|
EnableAsync挪到启动类
|
4 years ago |
|
jianjun
|
c3b5358736
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
d5c71e2084
|
循环依赖
|
4 years ago |
|
zxc
|
e7eec4adfd
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zxc
|
c220439e88
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
7855b5af90
|
加点日志
|
4 years ago |
|
yinzuomei
|
be7917e63b
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
sunyuchao
|
87ae44c389
|
网格活跃度统计导出增加业务逻辑
|
4 years ago |
|
yinzuomei
|
4feb35e9ca
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
e416692ca5
|
部署通知改为发到"开发测试-报警群"里
|
4 years ago |
|
zxc
|
f82b0d49ee
|
Merge remote-tracking branch 'origin/dev_import' into dev
|
4 years ago |
|
zhaoqifeng
|
9441692552
|
Merge branch 'dev_shuju_task' into dev
|
4 years ago |
|
wangxianzhang
|
c6dbfcf845
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
70831a50be
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
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
|
3c0f38351b
|
Merge branch 'develop' into release_temp
|
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
|
3a26f4d318
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
128e054402
|
Merge branch 'dev_shuju_task' into develop
|
4 years ago |
|
zhaoqifeng
|
9d281386b6
|
平阴三个街道上传项目统计数据校验
|
4 years ago |
|
zxc
|
227717f0ff
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zxc
|
5fa9f37de5
|
Merge branch 'dev_test_async' into develop
|
4 years ago |
|
zxc
|
e5ed398525
|
测试async
|
4 years ago |
|
zxc
|
bba13436a1
|
Merge branch 'develop' into release_temp
|
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
|
e9333f441a
|
测试async
|
4 years ago |
|
zxc
|
548a95ac3f
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zxc
|
b1d7e0e783
|
Merge branch 'dev_test_async' into develop
|
4 years ago |
