李鹏飞
|
cc32edaf48
|
1118代码回滚end
|
6 years ago |
|
李鹏飞
|
b60ed53037
|
1118代码回滚3
|
6 years ago |
|
李鹏飞
|
d0336f8fa7
|
1118 代码回滚2
|
6 years ago |
|
李鹏飞
|
abf2bdadbf
|
1118 代码回滚
|
6 years ago |
曲树通
|
42f804d8ed
|
修改路径
|
6 years ago |
|
李鹏飞
|
d4a16992a1
|
代码回滚模块
|
6 years ago |
|
李鹏飞
|
56abf7b3e2
|
Revert "代码回滚"
This reverts commit 0b41dd14
|
6 years ago |
|
李鹏飞
|
0b41dd1491
|
代码回滚
|
6 years ago |
wanggongfeng
|
ffe4098378
|
选项设置添加修改
|
6 years ago |
|
李鹏飞
|
dc2b7e558f
|
评价模块
|
6 years ago |
|
李鹏飞
|
ecd14c54d6
|
Merge branch 'dev_analysis' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
Conflicts:
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
esua-epdc/epdc-gateway/pom.xml
esua-epdc/epdc-gateway/src/main/resources/application.yml
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
|
6 years ago |
 尹作梅
|
31ce40054b
|
Merge remote-tracking branch 'origin/dev_analysis' into dev_analysis
|
6 years ago |
|
尹作梅
|
53e8a8676d
|
最热议题、最新议题列表查询
|
6 years ago |
yujintao
|
e069a21ce8
|
新增pc端获取机构层级接口
|
6 years ago |
|
尹作梅
|
e26eedfe9e
|
最热项目列表查询
|
6 years ago |
|
尹作梅
|
26d5d5485e
|
DynamicDataSourceConfig修改
|
6 years ago |
|
尹作梅
|
73eb30fd1f
|
最热话题、最新话题后台查询列表接口
|
6 years ago |
|
wanggongfeng
|
b1638ccae6
|
评价类别下拉查询数据库
|
6 years ago |
liuchuang
|
6edd1416b2
|
数据分析模块 init
|
6 years ago |
|
liuchuang
|
3733715d69
|
修改志愿者认证openId不能为空问题
|
6 years ago |
|
尹作梅
|
4cca04fb6e
|
bug#5140新增常用语服务器异常解决
|
6 years ago |
|
yujintao
|
ba091b221e
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
yujintao
|
572eb43f93
|
注释job与kpi模块多余依赖
|
6 years ago |
|
尹作梅
|
383725a6f6
|
取消活动扣减积分给用户发送消息
|
6 years ago |
|
尹作梅
|
7dacf4fd77
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
432fa7c5b4
|
积分行为编码、积分规则枚举类
|
6 years ago |
|
wanggongfeng
|
488a2bfe63
|
逻辑删除
|
6 years ago |
|
尹作梅
|
b845608184
|
调整积分-给用户发送消息通知-title修改
|
6 years ago |
|
尹作梅
|
84ebd4f30e
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
6db511cf05
|
打卡成功更新act_info表活动打卡人数；打卡积分-确定/拒绝给用户发送消息通知
|
6 years ago |
|
wanggongfeng
|
49a0be6615
|
删除关系表数据
|
6 years ago |
zhangyongzhangyong
|
ea79b565a8
|
banner排序规则：按照创建时间正序排序
招募令列表排序规则：发布活动的时间倒序，最新发布的在最上边
精彩活动列表排序规则：活动开始时间正序，最新（最近、最快）开始的，在最上边
已报名活动列表排序规则：用户报名时间倒序，最新报名的，在最上边
|
6 years ago |
|
liuchuang
|
3445a924e0
|
修改爱心时长字段类型
|
6 years ago |
|
yujintao
|
85dcdb3c06
|
绩效考核计划任务相关更改。可自定义时间；其他方法优化
|
6 years ago |
|
wanggongfeng
|
f5b44f129f
|
错误提交回滚之前版本
|
6 years ago |
|
wanggongfeng
|
4cb48d1c5f
|
干部人数更新
|
6 years ago |
|
李鹏飞
|
a71bb3e894
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
李鹏飞
|
41f05b494d
|
评价修改
|
6 years ago |
|
尹作梅
|
ab8843093f
|
points、heart发送消息补充提交
|
6 years ago |
|
尹作梅
|
0296291f43
|
志愿者管理-积分调整发送用户通知
|
6 years ago |
|
尹作梅
|
16e29ce0d1
|
报名审核、取消活动用户发送消息通知
|
6 years ago |
|
尹作梅
|
b36a0d3e0a
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
李鹏飞
|
095af33958
|
评价功能修改
|
6 years ago |
|
尹作梅
|
9440010e72
|
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/VolunteerInfoService.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
|
6 years ago |
|
尹作梅
|
87e3c90986
|
志愿者审批接口修改：未通过发送消息通知审批通过添加用户标签表更新redis中的userTagInfos值
|
6 years ago |
|
liuchuang
|
a0221d9ad2
|
确认积分时志愿者增加爱心时长
|
6 years ago |
|
zhangyongzhangyong
|
a7fdc5fe76
|
sql 错误修改
|
6 years ago |
|
wanggongfeng
|
06fe1ad7ef
|
上传
|
6 years ago |
|
wanggongfeng
|
547ced92ab
|
导入
|
6 years ago |
|
尹作梅
|
44ca62d28c
|
移动端完善用户信息ForDTO中的wxCode设为必填
|
6 years ago |
