wangxianzhang
|
446c2a552b
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
wangxianzhang
|
49833400f5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
jianjun
|
aede50c3c4
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
d3fe13dc9c
|
巡查先测测程序 稳定后 直接停用
|
4 years ago |
|
jianjun
|
6e7f85c2c6
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
1e379e4d0b
|
Revert "添加表单查询配置 列宽"
This reverts commit ebbd8482
|
4 years ago |
|
jianjun
|
ebbd84821b
|
添加表单查询配置 列宽
|
4 years ago |
|
jianjun
|
6da2a6682f
|
Revert "根据id逻辑删除方法 并填充字段"
This reverts commit 3a27ac45
|
4 years ago |
|
jianjun
|
3a27ac452f
|
根据id逻辑删除方法 并填充字段
|
4 years ago |
|
jianjun
|
4365364ed1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
303703a316
|
菜单缓存必须全干掉 *
|
4 years ago |
|
jianjun
|
d46e8e1154
|
菜单缓存必须全干掉
|
4 years ago |
zhaoqifeng
|
4184ad6ccf
|
Merge branch 'dev_work_event' into dev
|
4 years ago |
|
zhaoqifeng
|
b7abc3eb1c
|
项目历史数据
|
4 years ago |
sunyuchao
|
3c0e86430b
|
组织、用户数据同步中介库表字段变动调整
|
4 years ago |
|
wangxianzhang
|
396c7cd1f4
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
sunyuchao
|
332f154130
|
mq参数bug调整
|
4 years ago |
|
zhaoqifeng
|
30f35c723c
|
小区重名
|
4 years ago |
|
jianjun
|
523951d470
|
修改hystrix线程池配置参数
|
4 years ago |
|
zhaoqifeng
|
a21c3790c7
|
小区重名
|
4 years ago |
|
jianjun
|
804d752ced
|
测试下 up
|
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
|
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
|
8f0ea3e73c
|
修改巡查锁机制
|
4 years ago |
|
sunyuchao
|
1968bff922
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
4 years ago |
|
sunyuchao
|
3e8bc953ea
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目 程序调整
|
4 years ago |
|
sunyuchao
|
5b455d287f
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
4 years ago |
|
zhaoqifeng
|
4aea47ba2f
|
项目增加work_event来源，为网格员上报事件，修改设计到的统计查询
|
4 years ago |
|
sunyuchao
|
ed2e228306
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目
|
4 years ago |
|
jianjun
|
89ae2fa567
|
备份生成模板
|
4 years ago |
|
zhaoqifeng
|
588031204c
|
项目增加work_event来源，为网格员上报事件，修改设计到的统计查询
|
4 years ago |
|
sunyuchao
|
4efd53bb10
|
网格活跃度统计查询，源数据改查screen_project_data表，这个表平阴的是三个街道和小程序数据都有
|
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
|
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
|
4c056dfc39
|
Merge branch 'dev_grid_project_syc' into dev
|
4 years ago |
|
sunyuchao
|
fa02b87851
|
项目网格日统计 查询网格项目修改，网格的项目不再只是来源议题，也可以来源事件或者网格员上报事件，所以改查项目main表网格数据
|
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 |
|
jianjun
|
e3be103e7e
|
错误日志 获取traceId
|
4 years ago |
|
wangxianzhang
|
e332c10133
|
居民信息导入模板更新
|
4 years ago |
|
wangxianzhang
|
9435160826
|
调整ResultDataResolver处理错误Result的返回信息
|
4 years ago |
