李鹏飞
|
6a8a823fbe
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
李鹏飞
|
9469c140d7
|
项目统计接口bug调整
|
6 years ago |
王金鹏
|
e6c2a6284a
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
王金鹏
|
af3de7f681
|
分页bug
|
6 years ago |
|
李鹏飞
|
ea1f16f4f8
|
项目列表接口开发
|
6 years ago |
qushutong
|
386c69d7c2
|
App 菜单模板管理
|
6 years ago |
|
李鹏飞
|
93b46af450
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
# Conflicts:
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
|
6 years ago |
|
李鹏飞
|
25012602a3
|
项目列表接口开发
|
6 years ago |
yujintao
|
d5f78b5c53
|
Merge branch 'dev_1010' into dev_1118
|
6 years ago |
gupeng
|
76bdbe5df8
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
gupeng
|
2737ab7e49
|
党员信息详情修改
|
6 years ago |
|
yujintao
|
fd586a2bcd
|
删除多余代码
|
6 years ago |
|
yujintao
|
1060b2e19f
|
补充上次提交
|
6 years ago |
|
yujintao
|
fa0e406194
|
app菜单管理功能
|
6 years ago |
|
qushutong
|
bf952a5e14
|
查询待认证用户数量接口
|
6 years ago |
|
王金鹏
|
7d85c1a059
|
事件审核
|
6 years ago |
|
王金鹏
|
e4a307a507
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
王金鹏
|
089b6cc09a
|
添加注释
|
6 years ago |
|
gupeng
|
ac83077821
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
gupeng
|
f73b064e4f
|
找回丢失
|
6 years ago |
 尹作梅
|
226062d4b1
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
3f7f03142b
|
统一代码格式
|
6 years ago |
|
李鹏飞
|
0347cf437d
|
未认证用户接口调整
|
6 years ago |
|
李鹏飞
|
ec452c2a5b
|
项目统计接口+未认证用户接口测试修正
|
6 years ago |
|
李鹏飞
|
4c7915e77a
|
项目统计接口+未认证用户接口
|
6 years ago |
|
李鹏飞
|
59af088f02
|
代码覆盖回滚
|
6 years ago |
 管理员
|
8143781861
|
数据库设计
|
6 years ago |
|
qushutong
|
a760eacb04
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
李鹏飞
|
2943dde68b
|
项目统计接口+未认证用户接口
|
6 years ago |
|
qushutong
|
fcf47ff50d
|
冲突
|
6 years ago |
|
yujintao
|
0936309ab1
|
新增获取用户信息接口返回字段
|
6 years ago |
|
李鹏飞
|
74e6389175
|
项目统计接口+未认证用户接口
|
6 years ago |
|
gupeng
|
becf8cf395
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
# Conflicts:
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
|
6 years ago |
|
gupeng
|
488d0d9b21
|
党员信息详情修改
|
6 years ago |
|
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 |
liuchuang
|
697a03a62c
|
修改社群测试bug
|
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 |
