zxc
|
21c3ba7d7e
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
3 years ago |
|
zxc
|
f3e872ae4b
|
添加网格弃用状态
|
3 years ago |
jianjun
|
6aacc9fa78
|
居民端获取最后进入的网格撤回 微调
|
3 years ago |
|
jianjun
|
00ad3f117e
|
Revert "居民端 获取最后一次进入网格 添加弃用状态的判断"
This reverts commit 334230fa
|
3 years ago |
|
zxc
|
2428a253a3
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
3 years ago |
|
zxc
|
def4a20d61
|
添加网格弃用状态
|
3 years ago |
yinzuomei
|
f5b5c9a8d1
|
漏了
|
3 years ago |
|
yinzuomei
|
f157f5c485
|
弃用前置：未处理的事件+未关闭的议题。其他不管了
|
3 years ago |
sunyuchao
|
332f154130
|
mq参数bug调整
|
3 years ago |
|
zxc
|
65c1b4b904
|
网格下是否存在未审核的徽章
|
3 years ago |
|
sunyuchao
|
95ed4d218e
|
代码调整
|
3 years ago |
|
yinzuomei
|
c45778bbf3
|
grid/abandon弃用网格入口
|
3 years ago |
wangxianzhang
|
4edafe76d6
|
Merge branches 'dev_memo' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
9df11f7bd6
|
修改:解决jar包内文件无法读取
|
3 years ago |
|
wangxianzhang
|
7e8d3e6abe
|
Merge branch 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
041ad7979f
|
修改:解决jar包内文件无法读取
|
3 years ago |
|
zxc
|
d2c61a77ca
|
热心居民审核
|
3 years ago |
|
wangxianzhang
|
1b8edec585
|
Merge branch 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
zxc
|
453d8d3de2
|
网格下是否存在处理中的群众直报
|
3 years ago |
|
zxc
|
b6bf05b02b
|
网格下是否存在处理中的群众直报
|
3 years ago |
zhaoqifeng
|
c91570f3cb
|
人员关怀
|
3 years ago |
|
yinzuomei
|
960bd501db
|
/gov/mine/agency/getmygrids工作端获取我的网格列表
|
3 years ago |
|
zxc
|
d968906c8d
|
Merge remote-tracking branch 'origin/dev_memo' into develop
|
3 years ago |
|
yinzuomei
|
d07c40289b
|
/gov/org/grid/gridlist平阴通讯录-网格列表
|
3 years ago |
|
zxc
|
0328a84ad8
|
提示语
|
3 years ago |
|
zhaoqifeng
|
4dffdf1ded
|
人员关怀
|
3 years ago |
|
yinzuomei
|
5ac76581e6
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
|
3 years ago |
|
yinzuomei
|
1622660bb0
|
项目流转/gov/project/trace/departmentstafflist
|
3 years ago |
|
jianjun
|
16397c6198
|
工作端 获取工作人员所在网格中 加入弃用条件
|
3 years ago |
|
sunyuchao
|
f97f4e15e0
|
难点堵点详情已读修改
|
3 years ago |
|
jianjun
|
400b1f4703
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
|
3 years ago |
|
jianjun
|
e7be685c7d
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
|
3 years ago |
|
jianjun
|
334230fa31
|
居民端 获取最后一次进入网格 添加弃用状态的判断
|
3 years ago |
|
yinzuomei
|
c6c4a896fb
|
/article/publishagencylist 党建声音可选发布单位
|
3 years ago |
|
sunyuchao
|
d51f66be47
|
难点堵点列表
|
3 years ago |
|
yinzuomei
|
6bacc0c76e
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
|
3 years ago |
|
yinzuomei
|
60eb478f57
|
/gov/voice/article/agencygridlist 党建声音可选发布范围
|
3 years ago |
|
zhaoqifeng
|
dbe98fab02
|
工作日志
|
3 years ago |
|
zxc
|
2e7e9dc04a
|
存在党员审核，存在议题表决中
|
3 years ago |
|
wangxianzhang
|
a3faae5bc5
|
Merge branch 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
3baa8b9e5c
|
修改
|
3 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
|
3 years ago |
|
wangxianzhang
|
f52ab1b8d5
|
新增：
1.备忘录-人员关怀、难点堵点、工作日志的word导出接口
|
3 years ago |
|
sunyuchao
|
7a3c88a495
|
..
|
3 years ago |
|
yinzuomei
|
b1bb631860
|
resi/guide/stranger/publiclocationgridlist陌生人选择网格+去其他网格看看，添加ABANDON_FLAG='0'
|
3 years ago |
|
yinzuomei
|
27110a1bb2
|
/resi/guide/stranger/marketcontactinfo去其他网格看看，添加ABANDON_FLAG='0'
|
3 years ago |
|
sunyuchao
|
1f9dd227e5
|
..
|
3 years ago |
|
yinzuomei
|
a24c07fe4c
|
/resi/mine/mygrid/allgridsg居民端用户访问过的网格列表接口
|
3 years ago |
|
sunyuchao
|
c40df4938e
|
难点堵点
|
3 years ago |
|
yinzuomei
|
0012cbbb93
|
customer_grid表添加abandon_flag。
|
3 years ago |
