yinzuomei
|
f9b3f6dcf0
|
Merge branches 'dev' and 'dev_warn_notice' of http://121.42.41.42:7070/r/epmet-cloud into dev_warn_notice
|
4 years ago |
jianjun
|
b79991a743
|
类别变动添加 新增/减少后缀
|
4 years ago |
|
jianjun
|
6045046400
|
居民信息导出因打印日志错误导致 up
|
4 years ago |
|
jianjun
|
5e3d3cbc36
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
bf80572b46
|
居民信息导出因打印日志错误导致 up
|
4 years ago |
|
jianjun
|
216ae8ad2d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
790b74df7a
|
居民信息导出因打印日志错误导致
|
4 years ago |
zxc
|
dd5f9e18f2
|
人员预警变动
|
4 years ago |
|
jianjun
|
d4fcf7fd6a
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
f3c96e227c
|
添加user依赖
|
4 years ago |
|
yinzuomei
|
758e51fc65
|
批量删除up
|
4 years ago |
|
yinzuomei
|
226b39fef1
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
500094fc42
|
Merge remote-tracking branch 'origin/dev_delete' into dev
# Conflicts:
# 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/HouseServiceImpl.java
|
4 years ago |
|
yinzuomei
|
85e019535b
|
加了点注释
|
4 years ago |
sunyuchao
|
4032bd74cc
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
b2db940e71
|
平阴的三个街道的数据在表里同一天会存在两条，一条是上报的一条是小程序统计的，查询数据时分别兼容组织网格数据 again
|
4 years ago |
|
sunyuchao
|
4cfb8ddbaf
|
平阴的三个街道的数据在表里同一天会存在两条，一条是上报的一条是小程序统计的，查询数据时分别兼容组织网格数据
|
4 years ago |
|
yinzuomei
|
ec52c95ad4
|
data-agg 116
|
4 years ago |
|
yinzuomei
|
e7cfba450a
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
fda2b6b82f
|
Merge remote-tracking branch 'origin/dev_grid_active_syc' into dev
|
4 years ago |
|
yinzuomei
|
f9fb6ae645
|
网格活跃度统计改为新方法。 xlsx格式
|
4 years ago |
|
yinzuomei
|
94545a082c
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
4e1a9f02da
|
Merge remote-tracking branch 'origin/dev_grid_active_syc' into dev
|
4 years ago |
|
yinzuomei
|
0f52380596
|
网格活跃度统计改为新方法。 xlsx格式
|
4 years ago |
|
jianjun
|
65d9931686
|
关闭监控页面
|
4 years ago |
wangxianzhang
|
caae7f60a1
|
ttl改造完成，待测试
|
4 years ago |
|
jianjun
|
2351f777cf
|
多余的依赖
|
4 years ago |
zhaoqifeng
|
f906496059
|
统计升级
|
4 years ago |
|
zhaoqifeng
|
f72804a22e
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
6f0b7f784f
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
zhaoqifeng
|
f8c1acd2ca
|
Merge branch 'dev_shuju_task' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/DingDingRobotConstant.java
|
4 years ago |
|
jianjun
|
cccc1ad9e0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
75ca49624c
|
平阴项目统计数据校验
|
4 years ago |
|
zxc
|
8dc4023e10
|
EnableAsync挪到启动类
|
4 years ago |
|
jianjun
|
faadd24f52
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
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
|
7855b5af90
|
加点日志
|
4 years ago |
|
sunyuchao
|
1dc24ddd6a
|
网格活跃度统计导出增加业务逻辑 again
|
4 years ago |
|
sunyuchao
|
afe8ddb064
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
b8aa93a0a2
|
Merge branch 'dev_grid_active_syc' into dev
|
4 years ago |
|
wangxianzhang
|
22598685b6
|
添加线程池配置
|
4 years ago |
|
sunyuchao
|
87ae44c389
|
网格活跃度统计导出增加业务逻辑
|
4 years ago |
|
yinzuomei
|
e416692ca5
|
部署通知改为发到"开发测试-报警群"里
|
4 years ago |
|
zxc
|
71f57f0417
|
heart，org，resi-partyMember升级
|
4 years ago |
|
zxc
|
a648a87003
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
f82b0d49ee
|
Merge remote-tracking branch 'origin/dev_import' into dev
|
4 years ago |
|
zhaoqifeng
|
afc10b2771
|
统计和job升级
|
4 years ago |
|
zhaoqifeng
|
3a6d0df39c
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
9441692552
|
Merge branch 'dev_shuju_task' into dev
|
4 years ago |
