sunyuchao
|
8546ef1aef
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
af817561af
|
同步用户微信信息接口调整优化头像为非必填字段
|
5 years ago |
zxc
|
43a1ee0777
|
bug修复
|
5 years ago |
|
sunyuchao
|
553bfd54cf
|
生产-同步消息模板bug修改
|
5 years ago |
|
sunyuchao
|
e090426d50
|
Merge branch 'dev'
|
5 years ago |
zhaoqifeng
|
1ee7d04719
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
2c8419f5de
|
消息订阅初始化修改
|
5 years ago |
|
zxc
|
edcd61b5e1
|
bug修复
|
5 years ago |
wxz
|
40424ca30d
|
版本升级
|
5 years ago |
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
|
da6f09bf50
|
对外接口调整入参逻辑
|
5 years ago |
wangchao
|
db575c0ee1
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
|
wangchao
|
cf7c47bee1
|
userStreetName(格式: XX路-X先生/女士)
|
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
|
81ec30d0c8
|
小组议题-全部议题修改
|
5 years ago |
|
sunyuchao
|
9b92449d62
|
bug修改，关于历史小组数据首次生成小组海报报错的问题
|
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
|
e1b8979056
|
版本升级
|
5 years ago |
|
wxz
|
3d5659d2ab
|
版本升级
|
5 years ago |
|
wxz
|
fae496f25a
|
Merge branch 'dev'
|
5 years ago |
|
wangchao
|
3a419e3b9d
|
判断条件修改
|
5 years ago |
|
wangchao
|
3548817eb4
|
驳回后被屏蔽、关闭的话题不能再转为议题
|
5 years ago |
|
wangchao
|
1999f35158
|
处于【待审核】状态转议题的话题都不可屏蔽、关闭
|
5 years ago |
|
sunyuchao
|
b4fc3afa73
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
wangchao
|
296f196678
|
1、网格长审核议题后给话题发起人发送站内信2、工作端applicationDetail接口显示的话题发表人和议题发起人的昵称显示修改
|
5 years ago |
|
sunyuchao
|
5c99074050
|
新增邀请或扫码入组方法，旧方法不能兼容，增加v2.0接口
|
5 years ago |
|
wxz
|
6eb62542c5
|
Merge branch 'dev_govaccess_async' into dev
|
5 years ago |
|
wxz
|
07d99b2910
|
修复：【权限初始化器】修复可能出现的空指针问题
|
5 years ago |
|
wxz
|
8d4b42aef0
|
新增：【权限初始化器】做了针对opeName和brief的修改
|
5 years ago |
|
sunyuchao
|
eb06ce39a0
|
邀请入组的接口添加返参，标识是否存在审核中申请
|
5 years ago |
|
zhaoqifeng
|
2e2e57053f
|
我参与的议题-修改
|
5 years ago |
