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 |
|
wangchao
|
87df18def3
|
进入网格(enterGrid)接口增加返参userStreetName(格式: XX路-X先生/女士)
|
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 |
|
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 |
|
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
|
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 |
|
wangchao
|
3a419e3b9d
|
判断条件修改
|
5 years ago |
|
wangchao
|
56adafb154
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
3548817eb4
|
驳回后被屏蔽、关闭的话题不能再转为议题
|
5 years ago |
|
wxz
|
604760f35b
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wxz
|
59721157dc
|
wxz测试负载均衡修改
|
5 years ago |
|
wangchao
|
58f79560be
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
1999f35158
|
处于【待审核】状态转议题的话题都不可屏蔽、关闭
|
5 years ago |
|
wxz
|
d6c6db07d5
|
-
|
5 years ago |
|
wxz
|
ee92ec245f
|
-
|
5 years ago |
|
wxz
|
c0dbbe8dcb
|
-
|
5 years ago |
|
wxz
|
0d1b605f8b
|
lb-test修改Dockerfile文件
|
5 years ago |
|
wxz
|
6ebbae742c
|
Merge branch 'dev_lb_test' into dev_temp
|
5 years ago |
|
wxz
|
f717009441
|
修改compose文件
|
5 years ago |
|
wxz
|
af73be3ff1
|
Merge branch 'dev_lb_test' into dev_temp
|
5 years ago |
|
wxz
|
ff1b7874cf
|
新增负载均衡测试模块
|
5 years ago |
|
sunyuchao
|
b4fc3afa73
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
wangchao
|
5be353c070
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
296f196678
|
1、网格长审核议题后给话题发起人发送站内信2、工作端applicationDetail接口显示的话题发表人和议题发起人的昵称显示修改
|
5 years ago |
|
sunyuchao
|
8c4ac0637d
|
Merge branch 'dev_group_code' into dev_temp
|
5 years ago |
|
sunyuchao
|
5c99074050
|
新增邀请或扫码入组方法，旧方法不能兼容，增加v2.0接口
|
5 years ago |
|
wxz
|
6eb62542c5
|
Merge branch 'dev_govaccess_async' into dev
|
5 years ago |
|
wxz
|
3908eab0f1
|
Merge branch 'dev_govaccess_async' into dev_temp
|
5 years ago |
|
wxz
|
07d99b2910
|
修复：【权限初始化器】修复可能出现的空指针问题
|
5 years ago |
