yinzuomei
|
1a39c57ba3
|
Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
Conflicts:
epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
epmet-module/gov-access/gov-access-server/pom.xml
|
5 years ago |
|
yinzuomei
|
dc08497a6a
|
openfeignclient提交1
|
5 years ago |
|
yinzuomei
|
facb98244f
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
yinzuomei
|
47303e2b23
|
openfeignclient提交
|
5 years ago |
wangchao
|
46ccc9382e
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
wangchao
|
22cf4dbe1a
|
政府端-党建声音接口修改
|
5 years ago |
wxz
|
15c7820dc5
|
1.版本升级
|
5 years ago |
|
yinzuomei
|
97639af402
|
删除原来的CommonFeignClient改为EpmetCommonServiceOpenFeignClient
|
5 years ago |
jianjun
|
8d5d7e0a92
|
草稿属性发布范围
|
5 years ago |
|
wangchao
|
90b2fa79aa
|
文章显示阅读量+1
|
5 years ago |
|
wangchao
|
7e21ce7310
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
# Conflicts:
# epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
# epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java
# epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
|
5 years ago |
|
wangchao
|
095c4de6f2
|
resihome、resivoice服务调用govvoice
|
5 years ago |
|
wxz
|
29484abb06
|
1.govTokenDto中角色id列表改为角色简要信息
|
5 years ago |
zxc
|
23aad5b5d9
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
zxc
|
d67ad39866
|
级联标签排序
|
5 years ago |
|
yinzuomei
|
2fb38eac1d
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
yinzuomei
|
3919ca113f
|
角色添加注释
|
5 years ago |
|
jianjun
|
0cbc2169a1
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
jianjun
|
4e0e6088fd
|
发布范围添加 所有上级组织 id及名称 以及当前网格所在的组织Id
|
5 years ago |
sunyuchao
|
7fc0f9fb2c
|
党建声音-政府端-下线文章接口调整
|
5 years ago |
|
wxz
|
82bf4a3af6
|
1.编辑机关接口，增加redis删除缓存操作
|
5 years ago |
|
yinzuomei
|
725831f479
|
Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
|
5 years ago |
|
wangchao
|
1aa5fd6bee
|
居民端查看党建声音接口
|
5 years ago |
|
yinzuomei
|
a2dec75f20
|
冲突解决
|
5 years ago |
|
zxc
|
f991c6a18e
|
dto
|
5 years ago |
|
zxc
|
49b0f51c38
|
dto
|
5 years ago |
|
zxc
|
1df1c4726a
|
dto
|
5 years ago |
|
zxc
|
5c6888f3de
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
# Conflicts:
# epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/CorrelationTagListResultDto.java
# epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/TagInfoResultDto.java
|
5 years ago |
|
zxc
|
05836da669
|
dto
|
5 years ago |
|
zxc
|
4042677aec
|
DTO修改
|
5 years ago |
|
wxz
|
35c1ff48fe
|
1.GovOrg提供FeignClient出来
|
5 years ago |
|
zxc
|
5abc15e47e
|
居民端标签级联
|
5 years ago |
|
yinzuomei
|
fe912534cb
|
冲突解决
|
5 years ago |
zhaoqifeng
|
f6a861c2e8
|
引用修改
|
5 years ago |
|
zhaoqifeng
|
26955dbf80
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
jianjun
|
f1bb90ed9a
|
草稿发布接口暂存
|
5 years ago |
|
zhaoqifeng
|
e46d3fc414
|
政府端党建声音列表
|
5 years ago |
|
zhaoqifeng
|
bd6c4beaa4
|
政府端党建声音列表
|
5 years ago |
|
wxz
|
bb273b7db0
|
1.清理部分废弃接口
|
5 years ago |
|
jianjun
|
96c95c8f33
|
文章预览时保存草稿属性
|
5 years ago |
|
jianjun
|
46b5d35ea8
|
保存草稿属性接口暂存
|
5 years ago |
|
yinzuomei
|
f7f6d23865
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
yinzuomei
|
c7baee6f29
|
政府端：选中草稿编辑，获取草稿属性
|
5 years ago |
|
wxz
|
31df4191c8
|
1.版本升级
|
5 years ago |
|
wxz
|
973b8d6fe0
|
1.权限模块调整，将网格id和部门id的输入由单个字符串改为字符串列表
|
5 years ago |
|
sunyuchao
|
0cfb04b5dc
|
党建声音-政府端-下线文章接口首次提交
|
5 years ago |
|
sunyuchao
|
a382475e43
|
Merge branch 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
# Conflicts:
# epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
|
5 years ago |
|
yinzuomei
|
0080a253a8
|
政府端：选中草稿编辑，获取草稿属性
|
5 years ago |
|
yinzuomei
|
ab0cf5328c
|
Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
|
5 years ago |
|
yinzuomei
|
e182488ae9
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
