wxz
|
746b4166c1
|
Merge branch 'dev_bugfix_accessconfig' into dev_temp
|
5 years ago |
|
wxz
|
9c1539e91b
|
Merge branch 'dev' into dev_temp
# Conflicts:
# epmet-gateway/pom.xml
# epmet-module/epmet-common-service/common-service-server/pom.xml
# epmet-module/epmet-ext/epmet-ext-server/pom.xml
# epmet-module/epmet-heart/epmet-heart-server/pom.xml
# epmet-module/epmet-job/epmet-job-server/pom.xml
# epmet-module/epmet-oss/epmet-oss-server/pom.xml
# epmet-module/gov-access/gov-access-server/pom.xml
# epmet-module/gov-grid/gov-grid-server/pom.xml
# epmet-module/gov-issue/gov-issue-server/pom.xml
# epmet-module/oper-crm/oper-crm-server/pom.xml
# epmet-module/resi-group/resi-group-server/pom.xml
# epmet-module/resi-hall/resi-hall-server/pom.xml
# epmet-module/resi-mine/resi-mine-server/pom.xml
# epmet-module/resi-partymember/resi-partymember-server/pom.xml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
wxz
|
b1f340d8f5
|
修复：【工作端权限】运营端取消了操作，但是没取消范围，工作端小程序依然具有该权限
|
5 years ago |
sunyuchao
|
0aea19925e
|
Merge branch 'master' into dev
|
5 years ago |
|
sunyuchao
|
8546ef1aef
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
0277866c11
|
Merge branch 'dev_bugfix' into dev_temp
|
5 years ago |
|
sunyuchao
|
af817561af
|
同步用户微信信息接口调整优化头像为非必填字段
|
5 years ago |
|
sunyuchao
|
b906894dd1
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
745e93b4f9
|
议题、项目分类信息保存自测代码调整
|
5 years ago |
zxc
|
43a1ee0777
|
bug修复
|
5 years ago |
|
sunyuchao
|
5fe0f3d460
|
代码调整
|
5 years ago |
|
zxc
|
ccd33df10d
|
标签添加
|
5 years ago |
|
sunyuchao
|
54c03c1dbd
|
议题、项目：保存/修改分类
|
5 years ago |
wangchao
|
e4c97e6823
|
自定义标签类别Id常量
|
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 |
|
zhaoqifeng
|
9a5ed15561
|
议题转项目-分类标签
标签列表
|
5 years ago |
|
wangchao
|
d537d7e8d6
|
添加日志
|
5 years ago |
|
wangchao
|
8cfdf0b667
|
标签redis fetch接口
|
5 years ago |
|
zxc
|
7a46652a74
|
标签缓存添加
|
5 years ago |
|
zxc
|
95fc91a910
|
标签使用次数缓存修改方法添加
|
5 years ago |
|
sunyuchao
|
4b1cb65498
|
议题、项目分类、标签spl脚本
|
5 years ago |
|
sunyuchao
|
ec313e3810
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
782683abfc
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
sunyuchao
|
2533e106f0
|
接口自测问题修改
|
5 years ago |
|
wangchao
|
42fa70c787
|
标签key 标签redis接口
|
5 years ago |
|
sunyuchao
|
281404050b
|
分类列表查询
|
5 years ago |
|
zxc
|
70297412ec
|
Merge branch 'dev_bugfix_zxctopicdetail' into dev_temp
|
5 years ago |
|
zxc
|
edcd61b5e1
|
bug修复
|
5 years ago |
|
sunyuchao
|
4840bf722f
|
项目详情-标签分类查询-两端共用
|
5 years ago |
|
sunyuchao
|
11d79aac71
|
议题详情-标签分类查询-两端公共
|
5 years ago |
|
sunyuchao
|
4281356cee
|
代码还原
|
5 years ago |
|
sunyuchao
|
866b4653c5
|
表中添加字段
|
5 years ago |
|
sunyuchao
|
98463b39a2
|
议题、项目分类、标签代码生成
|
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
|
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 |
