yinzuomei
|
cf47e97204
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
5 years ago |
|
yinzuomei
|
52d9334daf
|
bug修改
|
5 years ago |
zhaoqifeng
|
7a8510ffc8
|
bug修改
|
5 years ago |
wangchao
|
4eea403e3a
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
# Conflicts:
# epmet-module/epmet-message/epmet-message-server/pom.xml
|
5 years ago |
|
wangchao
|
dcd471f510
|
更改参数注解
|
5 years ago |
|
wangchao
|
35d3c4393a
|
message的pom文件加上<activation>
|
5 years ago |
|
yinzuomei
|
264816ac21
|
messagepom修改
|
5 years ago |
|
yinzuomei
|
df9d7706e5
|
opercrm误提
|
5 years ago |
|
yinzuomei
|
5f51e472e3
|
messagepom文件修改
|
5 years ago |
|
wangchao
|
49d5487046
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
5 years ago |
|
wangchao
|
fdd17936fa
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
5 years ago |
|
yinzuomei
|
2d170e97b1
|
EpmetErrorCode修改
|
5 years ago |
|
wangchao
|
41e54b06a2
|
屏蔽话题修改
|
5 years ago |
wxz
|
a4e8dd826a
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
wxz
|
c78d249769
|
短信验证码修改
|
5 years ago |
|
yinzuomei
|
d88bb0baca
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
5 years ago |
|
yinzuomei
|
78b719f93c
|
message修改devnacos配置
|
5 years ago |
|
zhaoqifeng
|
1fb32bba5a
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
5 years ago |
|
zhaoqifeng
|
005f6465fb
|
党员认证获取短信验证码
|
5 years ago |
|
yinzuomei
|
7fb3a8bad0
|
我的小组groupLeaderFlag修改
|
5 years ago |
sunyuchao
|
635435461b
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
5 years ago |
|
sunyuchao
|
9af74f7e28
|
居民端-居民注册添加短信验证码服务
|
5 years ago |
|
wxz
|
7bfa9812c5
|
修复：MessageFeignClient缺少@PathVariable注解
|
5 years ago |
|
sunyuchao
|
b3eb5fc271
|
居民端-居民注册、热心申请模块insert语句修改 使用系统insert方法
|
5 years ago |
|
wxz
|
ccab39a11d
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
5 years ago |
|
wxz
|
98e7b6aa2f
|
修改：短信验证码接口，改为url传参。提供短信验证码接口的feign client
|
5 years ago |
hosinokamui
|
cb5aae62ae
|
修改 认证成功后添加角色
|
5 years ago |
|
wxz
|
f285ae6fc5
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
5 years ago |
|
wxz
|
91948ce28c
|
修改：将message-server模块的feign client挪到了message-client模块
|
5 years ago |
|
wangchao
|
f18e1be322
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
5 years ago |
|
wangchao
|
a059aa4ed7
|
话题、评论接口修改
|
5 years ago |
|
hosinokamui
|
3e89fb4b56
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
5 years ago |
|
hosinokamui
|
a5c5026085
|
修改 党员认证提交
|
5 years ago |
|
sunyuchao
|
0470ded8c6
|
居民端-居民注册信息提交入参修改
|
5 years ago |
|
wxz
|
bb35320ee0
|
新增：短信验证码接口
修改：/message/sms/send接口，由表单形式修改为json形式
|
5 years ago |
|
wxz
|
bb22079bec
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
5 years ago |
|
wxz
|
f41fc9b0a0
|
修复：新增EpmetBaseEntity update时机的自动填充
修改：去掉AuthFilter的@Configuration
|
5 years ago |
|
wangchao
|
0afa1ecd00
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
5 years ago |
|
wangchao
|
414eb97509
|
话题、评论接口修改，进入网格增加用户关系表的存在性校验
|
5 years ago |
|
wxz
|
ace875171d
|
修复：界面短信发送不能用的问题
|
5 years ago |
|
hosinokamui
|
a115b59638
|
api修改
|
5 years ago |
|
hosinokamui
|
9d066215e7
|
修改 认证成功后添加角色
|
5 years ago |
|
hosinokamui
|
5c6a50958a
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
# Conflicts:
# epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
|
5 years ago |
|
hosinokamui
|
7d87467f47
|
修改 认证成功后添加角色
|
5 years ago |
|
yinzuomei
|
6bf8ed658b
|
partymember编译bug修改
|
5 years ago |
|
sunyuchao
|
86f301314b
|
居民端-角色添加合并代码
|
5 years ago |
|
sunyuchao
|
aba13685f3
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java
|
5 years ago |
|
wangchao
|
fe4394a204
|
话题、评论相关接口
|
5 years ago |
|
sunyuchao
|
7a629c8000
|
居民端-居民注册添加角色信息
|
5 years ago |
|
wangchao
|
cac04f939f
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
5 years ago |
