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 |
|
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 |
|
sunyuchao
|
5b455d287f
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
4 years ago |
|
sunyuchao
|
ed2e228306
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目
|
4 years ago |
|
jianjun
|
89ae2fa567
|
备份生成模板
|
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 |
|
wangxianzhang
|
80d8d4ef47
|
版本升级
|
4 years ago |
|
sunyuchao
|
4c056dfc39
|
Merge branch 'dev_grid_project_syc' into dev
|
4 years ago |
|
sunyuchao
|
fa02b87851
|
项目网格日统计 查询网格项目修改，网格的项目不再只是来源议题，也可以来源事件或者网格员上报事件，所以改查项目main表网格数据
|
4 years ago |
|
wangxianzhang
|
635ed0d7c0
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
f33097be1c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
26a9de532e
|
修复：居民调动，detail表的type和typeName错误
|
4 years ago |
|
wangxianzhang
|
c3aa702772
|
版本升级
|
4 years ago |
|
wangxianzhang
|
29ed540b2e
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
e332c10133
|
居民信息导入模板更新
|
4 years ago |
|
sunyuchao
|
a3ed034c05
|
网格活跃度业务调整上报事件数改为网格内产生的项目数
|
4 years ago |
|
sunyuchao
|
5db422cf4b
|
开启巡查 网格、经纬度必填 again
|
4 years ago |
|
sunyuchao
|
fc2ac26df4
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
94640edc98
|
开启巡查 网格、经纬度必填
|
4 years ago |
|
jianjun
|
32cf7d73a1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
b79991a743
|
类别变动添加 新增/减少后缀
|
4 years ago |
