wangxianzhang
|
a3faae5bc5
|
Merge branch 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
3baa8b9e5c
|
修改
|
4 years ago |
|
wangxianzhang
|
52d19a051c
|
Merge remote-tracking branch 'origin/dev_memo' into dev_memo
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java
|
4 years ago |
|
wangxianzhang
|
f52ab1b8d5
|
新增：
1.备忘录-人员关怀、难点堵点、工作日志的word导出接口
|
4 years ago |
sunyuchao
|
7a3c88a495
|
..
|
4 years ago |
yinzuomei
|
b1bb631860
|
resi/guide/stranger/publiclocationgridlist陌生人选择网格+去其他网格看看，添加ABANDON_FLAG='0'
|
4 years ago |
|
yinzuomei
|
27110a1bb2
|
/resi/guide/stranger/marketcontactinfo去其他网格看看，添加ABANDON_FLAG='0'
|
4 years ago |
|
sunyuchao
|
1f9dd227e5
|
..
|
4 years ago |
|
yinzuomei
|
a24c07fe4c
|
/resi/mine/mygrid/allgridsg居民端用户访问过的网格列表接口
|
4 years ago |
|
sunyuchao
|
c40df4938e
|
难点堵点
|
4 years ago |
|
yinzuomei
|
0012cbbb93
|
customer_grid表添加abandon_flag。
|
4 years ago |
zhaoqifeng
|
8dba635743
|
工作日志
|
4 years ago |
|
sunyuchao
|
7bef86dded
|
.
|
4 years ago |
|
sunyuchao
|
8a1bfb496c
|
错提代码
|
4 years ago |
|
sunyuchao
|
0663b09b34
|
书记日志-消息提醒弹框列表接口初版
|
4 years ago |
|
zhaoqifeng
|
2502f4bd7e
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
2fe5ebbe59
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
30f35c723c
|
小区重名
|
4 years ago |
|
zhaoqifeng
|
d580806b63
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
jianjun
|
6f79b119f9
|
修改hystrix线程池配置参数 up
|
4 years ago |
|
jianjun
|
70955598d2
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
523951d470
|
修改hystrix线程池配置参数
|
4 years ago |
|
zhaoqifeng
|
a21c3790c7
|
小区重名
|
4 years ago |
|
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 |
