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
|
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
|
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
|
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 |
|
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 |
|
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
|
bc06152ae4
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
11042644d3
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
f410d93eec
|
Merge remote-tracking branch 'origin/dev_grid_active_syc' into develop
|
4 years ago |
|
yinzuomei
|
0f52380596
|
网格活跃度统计改为新方法。 xlsx格式
|
4 years ago |
|
jianjun
|
c124b75330
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
c5ccf7e380
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
97850812db
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
