yinzuomei
|
bc56eed5d6
|
Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
Conflicts:
epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
epmet-module/gov-project/gov-project-server/pom.xml
|
5 years ago |
|
yinzuomei
|
97ca6ab5c0
|
resivoice服务bug修改1
|
5 years ago |
|
yinzuomei
|
dd150b7a8a
|
resivoice服务bug修改
|
5 years ago |
|
yinzuomei
|
9bea5a4116
|
govvoice升级：nacos注册
|
5 years ago |
wxz
|
7bb591ae13
|
版本升级
|
5 years ago |
|
yinzuomei
|
fc4159c934
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
yinzuomei
|
c3dc756f14
|
resihome升级15：修改日志切面
|
5 years ago |
|
wxz
|
e68b3b461b
|
版本升级
|
5 years ago |
|
wxz
|
7a81c33485
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wxz
|
46d50c24ef
|
增加flyway配置，用于测试flyway
|
5 years ago |
|
yinzuomei
|
c6645dfbf2
|
resihome升级：添加日志切面
|
5 years ago |
zhaoqifeng
|
aa4d4bef76
|
保存草稿内容修改，文章列表排序
|
5 years ago |
sunyuchao
|
fec58f8484
|
党建声音-政府端-接口自测问题修改
|
5 years ago |
|
yinzuomei
|
d9df7c4ebc
|
govproject升级26
|
5 years ago |
|
yinzuomei
|
be8e5ca317
|
govproject升级
|
5 years ago |
|
yinzuomei
|
dc8d41be3c
|
测试1
|
5 years ago |
|
yinzuomei
|
bec1038138
|
dev服务升级
|
5 years ago |
|
yinzuomei
|
c9ca308dba
|
packaging改为pom
|
5 years ago |
|
yinzuomei
|
d591005c29
|
epmetuser模块统一使用EpmetUserOpenFeignClient
|
5 years ago |
|
yinzuomei
|
0b0f05f8ad
|
Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
|
5 years ago |
|
sunyuchao
|
d2928ac067
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
sunyuchao
|
5a2625d9fc
|
党建声音-政府端-可下线网格列表接口
|
5 years ago |
|
yinzuomei
|
4ab2deb624
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
yinzuomei
|
5ba9e9aa87
|
政府端草稿预览接口
|
5 years ago |
wangchao
|
494f84cfe3
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
# Conflicts:
# epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
|
5 years ago |
|
wangchao
|
82f49b25ba
|
草稿内容发布文章
|
5 years ago |
jianjun
|
719951d71b
|
添加 文章数据权限内容
|
5 years ago |
|
jianjun
|
e5acef4585
|
内容扫描项目暂存
|
5 years ago |
|
yinzuomei
|
ca0eb0f7a9
|
新增GovVoiceOpenFeignClient,删除原来的GovVoiceFeignClient
|
5 years ago |
|
yinzuomei
|
10fb1b8146
|
新增GovVoiceOpenFeignClient,删除原来的GovVoiceFeignClient
|
5 years ago |
|
wangchao
|
b8845ad947
|
居民端查看党建声音列表将标签名改成数组传递，删除重复dto，将govvoicefeign代码迁移到govvoiceopenfeign中，删除govvoicefeign中的重复代码
|
5 years ago |
|
wangchao
|
86a15256f4
|
Merge remote-tracking branch 'origin/dev_voice' into dev_voice
|
5 years ago |
|
wangchao
|
bf7e6c0b70
|
DTO修改
|
5 years ago |
|
yinzuomei
|
55b8aeaec8
|
新增GovOrgOpenFeignClient
|
5 years ago |
|
wxz
|
e5f6f1b5cd
|
1.版本升级
|
5 years ago |
|
yinzuomei
|
e597190e4c
|
新增govvoiceopenfeignclient
|
5 years ago |
|
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 |
