sunyuchao
|
5b388e76b2
|
Merge branch 'dev_group_code' into dev_temp
|
5 years ago |
|
sunyuchao
|
bec8b47d4f
|
sql脚本调整
|
5 years ago |
|
sunyuchao
|
d5e169eba9
|
Merge branch 'dev_group_code' into dev_temp
|
5 years ago |
|
sunyuchao
|
a4a83fdb3f
|
自测代码调整
|
5 years ago |
wangchao
|
f200b8abfb
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
wangchao
|
5e6dd0d610
|
徽章查询修改
|
5 years ago |
liushaowen
|
27b0311fb7
|
group_code表添加invitationId
|
5 years ago |
jianjun
|
3dd2d2899a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
jianjun
|
016ed7793c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
wxz
|
be43fe97aa
|
Merge branch 'dev_common' into dev
|
5 years ago |
yinzuomei
|
796cc157c7
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
yinzuomei
|
6dab1ffef0
|
修改user服务/userresiinfo/getuserresiinfo接口
|
5 years ago |
zhaoqifeng
|
ffe06cfb0b
|
小组议题-全部议题
|
5 years ago |
|
wangchao
|
4734b94b1b
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
af4c0091ed
|
难点赌点 修正时间
|
5 years ago |
|
jianjun
|
f046d50c69
|
Merge remote-tracking branch 'remotes/origin/dev_personal_center' into dev_temp
|
5 years ago |
|
jianjun
|
7abd59833a
|
徽章认证列表获取调整
|
5 years ago |
|
jianjun
|
373a8e021f
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev_temp
|
5 years ago |
|
jianjun
|
122c8cebcc
|
job feign接口日志配置
|
5 years ago |
zxc
|
92383ebf43
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
|
5 years ago |
|
zxc
|
1d9068a573
|
我参与的议题
|
5 years ago |
|
jianjun
|
e0c3492869
|
Merge branch 'dev_group_code' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_code
|
5 years ago |
|
jianjun
|
f8de85bb21
|
小组组长信息获取失败 日志
|
5 years ago |
|
wangchao
|
fe042a1312
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
zxc
|
b4500939ad
|
我参与的议题
|
5 years ago |
|
wangchao
|
35467ae457
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
sunyuchao
|
c196afc2cf
|
代码合并
|
5 years ago |
|
wangchao
|
7f44a2d45c
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
wangchao
|
f709bedaf5
|
难点赌点 全删全增
|
5 years ago |
|
sunyuchao
|
1a1361f9b1
|
Merge branch 'dev_group_code' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/pom.xml
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
zhaoqifeng
|
d414d962b9
|
小组议题-全部议题
|
5 years ago |
|
sunyuchao
|
ea9156a934
|
Merge remote-tracking branch 'origin/dev' into dev_temp
|
5 years ago |
|
jianjun
|
bffe8dc539
|
暂时废弃 初始化多appId的方式代码
|
5 years ago |
|
sunyuchao
|
4ef8e25b87
|
扫码进群添加是否开启审核机制
|
5 years ago |
|
wxz
|
cac28f16de
|
Merge branch 'dev_gateway_whitelist' into dev
|
5 years ago |
|
jianjun
|
7cd38e95c3
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev_temp
# Conflicts:
# epmet-user/epmet-user-server/pom.xml
# epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
jianjun
|
52b0eaea1b
|
服务统一添加 错误告警
|
5 years ago |
|
wxz
|
44074e9973
|
Merge branch 'dev_oss_fix' into dev_group_code
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
|
5 years ago |
|
yinzuomei
|
78b576a6ae
|
工作端-议题审核新增权限key
|
5 years ago |
|
zxc
|
03c8c5a1bb
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_issue_audit
|
5 years ago |
|
liushaowen
|
9533d51708
|
Merge branch 'dev_group_code' of http://121.42.41.42:7070/r/epmet-cloud into dev_group_code
|
5 years ago |
|
wxz
|
2cb0b4d102
|
Merge branch 'dev_oss_fix' into dev_temp
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
|
5 years ago |
|
wxz
|
4997d80e9a
|
修改，解决oss-client影响服务调用的问题
|
5 years ago |
|
yinzuomei
|
af95b5311a
|
组长开启/关闭入群审核
|
5 years ago |
|
jianjun
|
df0b92a477
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
|
5 years ago |
|
jianjun
|
97f4d46372
|
调用feign接口失败 返回错误，创建议题失败
|
5 years ago |
|
liushaowen
|
bfa25c3bb7
|
群二维码变为invitationId
|
5 years ago |
|
wangchao
|
d41fabda76
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
503d9e547e
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
jianjun
|
4079daeb11
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev_temp
|
5 years ago |
