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
|
6 years ago |
wangchao
|
fe4394a204
|
话题、评论相关接口
|
6 years ago |
|
sunyuchao
|
7a629c8000
|
居民端-居民注册添加角色信息
|
6 years ago |
|
wangchao
|
cac04f939f
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wangchao
|
3159b68152
|
话题、评论相关接口
|
6 years ago |
yinzuomei
|
7435c29f19
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
0c1b47f4ae
|
发送短信临时insertsql
|
6 years ago |
hosinokamui
|
8fce3b0a30
|
认证成功后添加角色
|
6 years ago |
|
yinzuomei
|
1c4628601a
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
9396b33186
|
oss模块修改
|
6 years ago |
|
sunyuchao
|
ad32d03765
|
居民端-热心居民申请模块接口逻辑调整
|
6 years ago |
|
hosinokamui
|
21e36c8aa3
|
新增 党员认证信息提交和党员认证信息补充功能
|
6 years ago |
|
yinzuomei
|
4f93a09803
|
去除@LogOperation,去除epmet-monitor-server
|
6 years ago |
|
yinzuomei
|
1c6092f289
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
503f1454b9
|
message修改db连接epmet_message
|
6 years ago |
|
sunyuchao
|
649e06d16a
|
居民端-居民注册根据手机号获取验证码
|
6 years ago |
|
hosinokamui
|
21769db26d
|
partyMemberInfoDao.xml修正
|
6 years ago |
|
wangchao
|
95bb02bb23
|
话题相关代码2
|
6 years ago |
|
sunyuchao
|
f60c49c010
|
居民端-居民注册信息提交接口-部分逻辑代码提交
|
6 years ago |
|
wangchao
|
3b406709a5
|
话题相关代码
|
6 years ago |
|
wangchao
|
b52b1e5305
|
话题相关代码
|
6 years ago |
|
yinzuomei
|
0a96568035
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
560310c00a
|
修改配置文件
|
6 years ago |
|
yinzuomei
|
d72d4242dd
|
新增接口：生成群链接、同意进群、根据邀请连接查询群基本信息v1
|
6 years ago |
|
yinzuomei
|
623676ee70
|
新增接口：生成群链接、同意进群、根据邀请连接查询群基本信息
|
6 years ago |
|
yinzuomei
|
45eb157324
|
selectOperUserInfoById入参改为user.id
|
6 years ago |
|
yinzuomei
|
eaf00d671c
|
申请入群增加校验避免重复申请
|
6 years ago |
|
yinzuomei
|
e18a2e6116
|
测试代码提交
|
6 years ago |
|
yinzuomei
|
e2c0ae6071
|
组长同意入群、拒绝入群接口添加校验
|
6 years ago |
|
sunyuchao
|
d15cb49cac
|
热心居民申请-申请表新增数据、行为记录表更新数据
|
6 years ago |
|
wangchao
|
2437c6d252
|
话题相关，将评论也放进话题中
|
6 years ago |
|
yinzuomei
|
3296dceb6b
|
topic相关dao去除resultMapv2
|
6 years ago |
|
yinzuomei
|
82e0a74d2f
|
topic相关dao去除resultMap
|
6 years ago |
|
wangchao
|
95376d0ceb
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
e3cc62059e
|
待审核成员列表新增status返参：审核中 - under_auditting、审核通过 - approved、入群被拒 - rejected 、
|
6 years ago |
|
wangchao
|
9135f07b4e
|
enterGrid修改，增加user_customer
|
6 years ago |
|
yinzuomei
|
c4fa935836
|
入群申请接口添加校验，避免重复申请
|
6 years ago |
|
yinzuomei
|
13e170121f
|
群成员列表返参DTO修改memberId
|
6 years ago |
|
yinzuomei
|
a62b3bc3ab
|
推荐小组接口sql修改
|
6 years ago |
|
yinzuomei
|
acb2f76b0a
|
新增拒绝群申请，后期会放到政府端，目前测试用
|
6 years ago |
|
yinzuomei
|
b7a1c37aef
|
新增网格长审核群申请接口-用来测试
|
6 years ago |
|
yinzuomei
|
5861129244
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
2543fa1b28
|
创建群接口修改
|
6 years ago |
|
wangchao
|
18e3a16d04
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wangchao
|
c60d4727e7
|
话题相关文件
|
6 years ago |
|
hosinokamui
|
f28d84f968
|
新增党员认证页面初始化和获取手机验证码功能
|
6 years ago |
|
sunyuchao
|
0205356fb2
|
解决Git服务误删、错提文件问题
|
6 years ago |
|
sunyuchao
|
e3182f4a15
|
热心居民申请页面初始化-查询是否已申请以及行为记录表新增数据
|
6 years ago |
|
wangchao
|
914972e87e
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
wangchao
|
0c8e666f6b
|
进入网格相关代码2
|
6 years ago |
