qushutong
|
a4ddbb5f6e
|
解决冲突---党员用户待审核列表
|
6 years ago |
 尹作梅
|
bfae13bf68
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
b5ce09beb3
|
党员详情
|
6 years ago |
王金鹏
|
9ee2620ecd
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
王金鹏
|
4820c4a453
|
议题接口
|
6 years ago |
gupeng
|
2350ca1677
|
修改文件名称
|
6 years ago |
|
gupeng
|
a4558d1225
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
# Conflicts:
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
|
6 years ago |
|
gupeng
|
6383518202
|
党员信息详情
|
6 years ago |
|
尹作梅
|
3e877ad967
|
认证用户接口
|
6 years ago |
|
尹作梅
|
3b0054cd95
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
# Conflicts:
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
|
6 years ago |
|
尹作梅
|
b22703cf3e
|
业务端居民用户详情接口DTO类名修改
|
6 years ago |
yujintao
|
47c03dc422
|
修复完善个人信息bug
|
6 years ago |
|
yujintao
|
6df8b42615
|
修改用户状态枚举类
|
6 years ago |
|
王金鹏
|
5a93d5d54d
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
王金鹏
|
880b9ededf
|
议题状态统计
|
6 years ago |
|
yujintao
|
1baf5ceadc
|
合并1114分支
|
6 years ago |
|
yujintao
|
c98d9b34fb
|
完善个人信息接口修改
|
6 years ago |
|
尹作梅
|
6987e9c128
|
业务端居民用户详情接口
|
6 years ago |
|
gupeng
|
70863acb89
|
Merge branch 'dev_1114' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1114
|
6 years ago |
|
gupeng
|
77463874e1
|
认证失败的党员列表
|
6 years ago |
|
尹作梅
|
2e9903a0b8
|
日志管理新增第三方接口调用日志列表功能
|
6 years ago |
|
yujintao
|
024e4a3ab1
|
补充上次提交
|
6 years ago |
|
yujintao
|
2e3f3e7f81
|
用户登录、用户管理三层结构
|
6 years ago |
liuchuang
|
ee5c3b2ee9
|
添加分支说明
|
6 years ago |
|
liuchuang
|
8b96a45fc6
|
数据库脚本
|
6 years ago |
|
liuchuang
|
25e2140758
|
修改bug
|
6 years ago |
|
liuchuang
|
8648b20d3a
|
社群排行榜后台数据初始化
|
6 years ago |
|
liuchuang
|
b548799b62
|
话题审核通过拷贝评论和评论表态到事件中
|
6 years ago |
|
liuchuang
|
d738b1ca2e
|
后台话题管理接口 init
|
6 years ago |
|
liuchuang
|
ac688b17e0
|
话题的评论回复、评论的支持反对发送消息
|
6 years ago |
|
liuchuang
|
7c51498367
|
修改话题列表接口
我的话题列表接口 init
|
6 years ago |
|
liuchuang
|
e19eeca614
|
用户完善信息后更新社群用户党员标识
|
6 years ago |
|
liuchuang
|
9958239625
|
申请入群接口 init
|
6 years ago |
|
liuchuang
|
003b030762
|
事件审核、议题转项目回调话题处理
|
6 years ago |
|
王金鹏
|
65baa409b6
|
Merge branch 'dev_1010' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1010
|
6 years ago |
|
王金鹏
|
a4038a8ead
|
no message
|
6 years ago |
|
yujintao
|
6ebff747ab
|
合并分支
|
6 years ago |
|
liuchuang
|
63b60492d8
|
话题话题转议题接口 init
|
6 years ago |
|
王金鹏
|
7aa505f0f1
|
话题列表
|
6 years ago |
|
liuchuang
|
372c7e8474
|
话题审核记录接口 init
|
6 years ago |
|
liuchuang
|
7d17cc0a46
|
关闭话题接口 init
|
6 years ago |
|
liuchuang
|
2712465d46
|
修改社群成员列表排序方式
|
6 years ago |
|
liuchuang
|
b2a424fa6b
|
话题详情接口 init
|
6 years ago |
|
liuchuang
|
4dace756bc
|
修改获取菜单消息方法
|
6 years ago |
|
liuchuang
|
866f97d8ed
|
发布话题接口 init
|
6 years ago |
|
王金鹏
|
056594d68d
|
赞踩
|
6 years ago |
|
王金鹏
|
162a443577
|
Merge branch 'dev_1010' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1010
|
6 years ago |
|
王金鹏
|
1c2bb170d9
|
评论列表
|
6 years ago |
|
liuchuang
|
dba08f8396
|
审核入群申请接口 init
|
6 years ago |
|
liuchuang
|
07d94887f2
|
社群添加好友发送消息通知
|
6 years ago |
