yinzuomei
|
8d986e65d9
|
heart服务升级到56
|
5 years ago |
|
yinzuomei
|
c3d4ec3423
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
30ee0c8e97
|
居民端爱心榜heart/resi/act/leaderboard接口修改
|
5 years ago |
sunyuchao
|
d16987ba15
|
对外接口调整入参逻辑
|
5 years ago |
|
sunyuchao
|
514916eecc
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
c49a57f594
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
74a48a4d76
|
Merge branch 'dev_bugfix' into dev_temp
|
5 years ago |
|
sunyuchao
|
da6f09bf50
|
对外接口调整入参逻辑
|
5 years ago |
wangchao
|
db575c0ee1
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
|
wangchao
|
ef5fad0daf
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
cf7c47bee1
|
userStreetName(格式: XX路-X先生/女士)
|
5 years ago |
|
wangchao
|
182476c677
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# 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-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
wxz
|
c70704336e
|
增加为单个角色，批量添加多个操作权限和操作范围的接口
|
5 years ago |
|
wangchao
|
87df18def3
|
进入网格(enterGrid)接口增加返参userStreetName(格式: XX路-X先生/女士)
|
5 years ago |
|
wxz
|
7d6362f19d
|
版本升级
|
5 years ago |
|
wxz
|
26ad189011
|
Merge branch 'dev'
|
5 years ago |
|
wangchao
|
1c91327b89
|
Merge remote-tracking branch 'origin/dev' into dev_issue_audit
|
5 years ago |
zhaoqifeng
|
41224558eb
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
722738c204
|
Merge branch 'dev_issue_audit' into dev_temp
|
5 years ago |
|
yinzuomei
|
a64bcb510c
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
81ec30d0c8
|
小组议题-全部议题修改
|
5 years ago |
|
sunyuchao
|
9b92449d62
|
bug修改，关于历史小组数据首次生成小组海报报错的问题
|
5 years ago |
|
wangchao
|
a66da827cf
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
a31083a567
|
当议题申请第一次被拒绝后，第二次申请之前将议题开关关闭，二次申请后生成的两条申请历史1、under_auditing 2、auto_passed先后之间的createdTime要相差一秒，保证议题审核历史列表排序的正确性
|
5 years ago |
zxc
|
289f8d1336
|
审核历史倒叙
|
5 years ago |
|
wxz
|
4a99217a1a
|
版本升级
|
5 years ago |
|
wxz
|
8b35a67aef
|
版本升级
|
5 years ago |
|
wxz
|
971e0e5419
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
97f449250f
|
Merge branch 'dev_group_code' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# 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-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
|
sunyuchao
|
b5764f292f
|
Merge branch 'dev_issue_audit' into dev
|
5 years ago |
|
sunyuchao
|
caad078975
|
小程序代码上传时同步更新两个小程序最新名称
|
5 years ago |
|
sunyuchao
|
1abfc072c9
|
Merge branch 'dev'
|
5 years ago |
|
zhaoqifeng
|
19d5220088
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
d88c2d2a36
|
上传代码时，更新小程序名
|
5 years ago |
|
wxz
|
2a86b4b127
|
添加优雅停机配置
|
5 years ago |
|
wxz
|
27afa69e9d
|
loadBanancer测试
|
5 years ago |
|
wxz
|
9ee059fe9a
|
增加LbController测试类
|
5 years ago |
|
wxz
|
89fd63701e
|
去掉负载均衡服务
|
5 years ago |
|
wxz
|
70b2b8a35d
|
去掉负载均衡服务
|
5 years ago |
|
wxz
|
d3fbc3f334
|
增加负载均衡测试服务
|
5 years ago |
|
wxz
|
7b38960810
|
增加负载均衡测试服务
|
5 years ago |
|
wxz
|
30f23056b2
|
删除epmet-lb-test服务
|
5 years ago |
|
wxz
|
a4caa066c4
|
wxz的负载均衡测试
|
5 years ago |
|
wxz
|
e1b8979056
|
版本升级
|
5 years ago |
|
wxz
|
3d5659d2ab
|
版本升级
|
5 years ago |
|
wxz
|
fae496f25a
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
0014fa06bb
|
wxz测试负载均衡修改
|
5 years ago |
|
wxz
|
71c90e6cfa
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wxz
|
a6a1a8c001
|
wxz测试负载均衡修改
|
5 years ago |
|
wangchao
|
312214b590
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
