yinzuomei
|
e55d3cb787
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
8b1803c7e8
|
Merge remote-tracking branch 'origin/dev_warn_notice' into develop
|
4 years ago |
|
yinzuomei
|
44484685d5
|
warn
|
4 years ago |
zxc
|
fad96b2266
|
Merge branch 'dev_memo' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
|
4 years ago |
|
zxc
|
bed41c106b
|
党群服务中心删除
|
4 years ago |
jianjun
|
6d7ae178b4
|
测试下 up
|
4 years ago |
|
jianjun
|
170877ae68
|
Merge branches 'master', 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
804d752ced
|
测试下 up
|
4 years ago |
|
jianjun
|
515c1ed230
|
测试下 up
|
4 years ago |
|
jianjun
|
15fb33abf8
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
da58fb850b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
a649b13e97
|
测试下
|
4 years ago |
wangxianzhang
|
b53bc345e5
|
删除错误提交
|
4 years ago |
|
jianjun
|
d84a512c55
|
临时 加大feign核心线程数 up
|
4 years ago |
|
jianjun
|
6546306973
|
Merge branches 'master' and 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
8bbd3dde89
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
e382926077
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
151543ef6c
|
临时 加大feign核心线程数
|
4 years ago |
sunyuchao
|
79cec12400
|
数据日志代码生成
|
4 years ago |
|
wangxianzhang
|
9010f2fc21
|
增加：Memo备忘相关dto dao...
修改：Nacos动态上下线，去掉服务列表日志打印
|
4 years ago |
|
jianjun
|
605c532b79
|
路径驼峰
|
4 years ago |
|
jianjun
|
2aa45e4dc5
|
mapingurl修改
|
4 years ago |
|
jianjun
|
3bb1c31723
|
修改巡查锁机制 up
|
4 years ago |
|
jianjun
|
013b493d33
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
8f0ea3e73c
|
修改巡查锁机制
|
4 years ago |
|
sunyuchao
|
58f1aa810e
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目 程序调整 again
|
4 years ago |
|
sunyuchao
|
485f5e30c7
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
1968bff922
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
4 years ago |
|
sunyuchao
|
3e8bc953ea
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目 程序调整
|
4 years ago |
|
sunyuchao
|
9a8528004b
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目 again
|
4 years ago |
|
sunyuchao
|
f7619f15f5
|
Merge branch 'dev'
|
4 years ago |
|
yinzuomei
|
99a0f32e5d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
sunyuchao
|
5b455d287f
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
4 years ago |
zhaoqifeng
|
e99c4d3ad3
|
Merge branch 'dev_work_event' into develop
|
4 years ago |
|
zhaoqifeng
|
4aea47ba2f
|
项目增加work_event来源，为网格员上报事件，修改设计到的统计查询
|
4 years ago |
|
sunyuchao
|
ed2e228306
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目
|
4 years ago |
|
jianjun
|
89ae2fa567
|
备份生成模板
|
4 years ago |
|
zhaoqifeng
|
cfc2f94d6d
|
Merge branch 'dev_work_event' into develop
|
4 years ago |
|
zhaoqifeng
|
588031204c
|
项目增加work_event来源，为网格员上报事件，修改设计到的统计查询
|
4 years ago |
|
sunyuchao
|
edd9bd3850
|
网格活跃度统计查询，源数据改查screen_project_data表，这个表平阴的是三个街道和小程序数据都有 again
|
4 years ago |
|
sunyuchao
|
9d7d7081d0
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
4efd53bb10
|
网格活跃度统计查询，源数据改查screen_project_data表，这个表平阴的是三个街道和小程序数据都有
|
4 years ago |
|
wangxianzhang
|
a879165e47
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
0ec8d05cf8
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
b748556401
|
-
|
4 years ago |
|
wangxianzhang
|
9503595b4b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
07927d5093
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
53f98c8c42
|
版本升级
|
4 years ago |
|
sunyuchao
|
f3cf1dbe0c
|
网格活跃度上报事件改为网格项目数 again
|
4 years ago |
|
sunyuchao
|
39a1667005
|
Merge branch 'dev'
|
4 years ago |
