sunyuchao
|
bed78df3b0
|
Merge branch 'dev_group0329' into dev_temp
|
4 years ago |
|
sunyuchao
|
f1886ce21a
|
删除组员添加在群组统计表数据、话题操作记录表数据修改逻辑
|
4 years ago |
jianjun
|
403ee4927f
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
63725e21cf
|
oss删除方法优化
|
4 years ago |
|
jianjun
|
033baa6272
|
Merge branch 'dev_voice_attachment' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
fee3efa95c
|
oss上传文件代码重复
|
4 years ago |
|
jianjun
|
dbeed20e60
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
78bcaea9e6
|
oss删除文件 代码调整
|
4 years ago |
|
jianjun
|
1692fdc765
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
bdcb8947dd
|
oss删除文件 代码调整
|
4 years ago |
|
jianjun
|
da542c9c67
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
366ee1edfd
|
oss删除文件 代码调整
|
4 years ago |
yinzuomei
|
7942f09912
|
Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
|
4 years ago |
|
sunyuchao
|
d608a89c87
|
Merge remote-tracking branch 'origin/dev_group0329' into dev_group0329
|
4 years ago |
|
sunyuchao
|
e05295ae67
|
接口自测问题修改
|
4 years ago |
|
jianjun
|
3b8e43648d
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
7a28485378
|
oss删除文件
|
4 years ago |
|
jianjun
|
2ab5a8d3ba
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
33c2391798
|
oss删除文件
|
4 years ago |
|
jianjun
|
bb2238013c
|
返回文件名称
|
4 years ago |
zxc
|
456e63b954
|
可胜任组长-组员列表(工作端通用)
|
4 years ago |
|
sunyuchao
|
74bbe6258b
|
小组成员删除
|
4 years ago |
zhaoqifeng
|
c67d86d16d
|
删除党建声音文件
|
4 years ago |
|
jianjun
|
2c9b55b402
|
Merge branch 'dev_voice_attachment' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
c0ec3f3a36
|
返回文件名称
|
4 years ago |
wxz
|
98806364b4
|
修复：jwt过期之后，取过期时间为空，造成的空指针问题
|
4 years ago |
|
jianjun
|
2506cff2fa
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
|
jianjun
|
6be68765de
|
返回文件名称
|
4 years ago |
|
jianjun
|
342935e782
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
4845bf3f03
|
文章内容 如果为文件 则校验文件名不能为空
|
4 years ago |
|
yinzuomei
|
ecf0811b67
|
Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
|
4 years ago |
|
yinzuomei
|
b135bda98a
|
转让组接口v2
|
4 years ago |
wangchao
|
98af8a04be
|
评价周期内被吹哨且被办结的项目数
|
4 years ago |
|
yinzuomei
|
2a20d01b90
|
转让组接口v1
|
4 years ago |
|
yinzuomei
|
50a2792505
|
查找群主：resi_group_member.GROUP_LEADER_FLAG = 'leader'
|
4 years ago |
|
jianjun
|
b272ae5afa
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
4 years ago |
|
jianjun
|
4183d436df
|
文章内容 如果为文件 则校验文件名不能为空
|
4 years ago |
|
yinzuomei
|
c6897da76a
|
Merge branches 'dev' and 'dev_group0329' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group0329
|
4 years ago |
|
yinzuomei
|
bb9ecd664e
|
转让组接口
|
4 years ago |
|
yinzuomei
|
6dea3eeff5
|
话题评论列表添加条件and `STATUS`='discussing'
|
4 years ago |
|
jianjun
|
ca227ad968
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
6b6f0ce092
|
文章详情返回filename
|
4 years ago |
|
jianjun
|
410bdb054d
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
4 years ago |
|
jianjun
|
83c152008f
|
oss返回domain域名用于替换
|
4 years ago |
zhangyongzhangyong
|
539bc2694b
|
Merge branch 'dev_issue_category' into dev_temp
|
4 years ago |
|
zhangyongzhangyong
|
c589a9d00e
|
议题项目分类字典表，根据id+customerId联合主键修改
|
4 years ago |
|
wxz
|
cd22ec47cb
|
Merge branch 'dev_gateway_extauth' into dev
|
4 years ago |
|
wxz
|
40fb288fc0
|
修复：对外开放api，没有认证即可访问接口的bug
|
4 years ago |
|
yinzuomei
|
8ce822ed99
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
4 years ago |
|
yinzuomei
|
ea7e91a022
|
Merge branches 'dev' and 'dev_group0329' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group0329
|
4 years ago |
