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 |
|
sunyuchao
|
ea9156a934
|
Merge remote-tracking branch 'origin/dev' into dev_temp
|
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 |
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 |
|
jianjun
|
252e4f76b2
|
httpclientManger 调整超时时间
|
5 years ago |
|
wangchao
|
b1ac7b1fde
|
我参与的话题，网格名称
|
5 years ago |
|
yinzuomei
|
cf1d5becb6
|
Merge remote-tracking branch 'origin/dev_group_code' into dev_group_code
|
5 years ago |
|
yinzuomei
|
5b48b6e570
|
查询组管理界面信息接口新增返参：auditSwitch ：进组审核open开启；close关闭
|
5 years ago |
|
sunyuchao
|
0208f3ac41
|
群邀请链接接口调整
|
5 years ago |
|
sunyuchao
|
c3bb161809
|
DB调整
|
5 years ago |
|
wangchao
|
1c5e321e06
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
yinzuomei
|
39ea1a7dc8
|
修改resi_group_member和group_member_operation中的enter_group_type描述，新增扫码入群 scancode
|
5 years ago |
|
yinzuomei
|
856e131c8d
|
扫码：scancode
|
5 years ago |
|
yinzuomei
|
ea89d17f9e
|
Merge remote-tracking branch 'origin/dev_group_code' into dev_group_code
|
5 years ago |
|
yinzuomei
|
cb5f25b14b
|
resi_group新增AUDIT_SWITCH；group_invitation新增INVITATION_TYPE
|
5 years ago |
|
liushaowen
|
a04c51d7ba
|
补
|
5 years ago |
|
liushaowen
|
531931c818
|
生成二维码增加线程池
|
5 years ago |
|
wangchao
|
203cfd864a
|
抽取到大屏-难点赌点、热心市民，小组原始数据，兼容因为删除网格而造成垃圾数据的情况
|
5 years ago |
|
sunyuchao
|
6d6f4b6c9d
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
jianjun
|
1fd26a8c59
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev_temp
|
5 years ago |
|
jianjun
|
dd9fadda9c
|
httpclientManger 提取常量；调整超时时间为3-》4秒
|
5 years ago |
|
sunyuchao
|
76b099ccec
|
添加获取二维码、生成二维码方法引用
|
5 years ago |
|
sunyuchao
|
50b6ccbf1b
|
小组二维码
|
5 years ago |
|
jianjun
|
48042b49cd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
|
jianjun
|
ea4045b37e
|
修改 项目原始数据抽取 删除数据提出
|
5 years ago |
|
jianjun
|
a61142656e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
|
jianjun
|
0b4375f87c
|
修改 项目原始数据抽取 删除数据提出
|
5 years ago |
|
wangchao
|
f25e1b65b0
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wangchao
|
25a54c5a3d
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
97706e0a17
|
抽取到大屏-难点赌点、热心市民，兼容因为删除网格而造成垃圾数据的情况
|
5 years ago |
|
sunyuchao
|
4b4a3f68d9
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
b7753e0272
|
bug修改，feginclient多添加url问题
|
5 years ago |
|
sunyuchao
|
57cf9ddb49
|
接口调整
|
5 years ago |
zxc
|
be9fb8a1d4
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
7193932aa0
|
添加issueID
|
5 years ago |
|
yinzuomei
|
8705824e0c
|
网格id去重
|
5 years ago |
|
jianjun
|
143dc94d44
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
