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 |
yinzuomei
|
345a3e6313
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
617b136b3c
|
Merge remote-tracking branch 'origin/dev_warn_notice' into develop
|
4 years ago |
|
yinzuomei
|
c16f1fb805
|
feign url
|
4 years ago |
jianjun
|
de5dfdc878
|
Merge branch '主线开发' into 主线测试
|
4 years ago |
|
jianjun
|
ae535669fd
|
Merge remote-tracking branch 'remotes/origin/wxz_ttl' into 主线开发
|
4 years ago |
|
jianjun
|
e3be103e7e
|
错误日志 获取traceId
|
4 years ago |
|
wangxianzhang
|
2459d57e06
|
Merge branches 'release_temp' and 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
b3dc077626
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
e332c10133
|
居民信息导入模板更新
|
4 years ago |
|
wangxianzhang
|
a95b4b131d
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
9435160826
|
调整ResultDataResolver处理错误Result的返回信息
|
4 years ago |
|
sunyuchao
|
a3ed034c05
|
网格活跃度业务调整上报事件数改为网格内产生的项目数
|
4 years ago |
|
wangxianzhang
|
d6150df5ef
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
65dae64051
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
1f28354fc9
|
gateway tranceId改造
|
4 years ago |
|
sunyuchao
|
d49da92f6b
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
9eb65c43c1
|
Merge branch 'dev_staff_patrol_syc' into develop
|
4 years ago |
|
yinzuomei
|
743ce78c42
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
4039e152d1
|
Merge remote-tracking branch 'origin/dev_warn_notice' into develop
|
4 years ago |
|
yinzuomei
|
5f98ecc2ac
|
调整列表展示项顺序
|
4 years ago |
|
sunyuchao
|
94640edc98
|
开启巡查 网格、经纬度必填
|
4 years ago |
|
wangxianzhang
|
1c73d08444
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
6c0e5d34aa
|
gateway tranceId改造
|
4 years ago |
|
wangxianzhang
|
cbe70ac844
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
a6d17f71fe
|
改造：MCD+TraceId日志追踪
|
4 years ago |
|
yinzuomei
|
f372bb76a7
|
Merge remote-tracking branch 'origin/dev_warn_notice' into develop
# 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
|
c616bbc370
|
新增ic_form_list_item
|
4 years ago |
|
yinzuomei
|
1508cf9236
|
注释
|
4 years ago |
|
yinzuomei
|
92da5a13d5
|
/epmetuser/statsresiwarn/queryuserwarnnotice
|
4 years ago |
|
jianjun
|
32cf7d73a1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
7b435cb7bc
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
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
|
73936eb564
|
Merge branches 'dev_bugfix_ljj' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
b79991a743
|
类别变动添加 新增/减少后缀
|
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
|
821548103c
|
Merge branch 'dev_warn_notice' into develop
|
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 |
|
sunyuchao
|
42ae033825
|
Merge branch 'dev_py_operatedata_syc' into develop
|
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 |
|
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 |
|
wangxianzhang
|
fec62cbf2b
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
