 尹作梅
|
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 |
|
尹作梅
|
81646dd960
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
fbd23f222c
|
活动不限名额详情用户状态修改
|
6 years ago |
|
yujintao
|
157158643c
|
Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118
|
6 years ago |
|
yujintao
|
de59239321
|
kpi元数据生成bug修改
|
6 years ago |
|
wanggongfeng
|
8b5ad04815
|
干部评价设置
|
6 years ago |
|
zhangyongzhangyong
|
1636375605
|
解决：
打卡详情列表排序不正确；
打卡详情列表性别数据列未展示；
已报名已结束列表数据显示错误；
|
6 years ago |
|
yujintao
|
4df79fbef3
|
绩效考核定时任务功能扩展
|
6 years ago |
|
yujintao
|
439c204c79
|
绩效考核定时任务功能拓展
|
6 years ago |
|
zhangyongzhangyong
|
358787f88e
|
活动详情空指针解决
|
6 years ago |
|
zhangyongzhangyong
|
fa8ad952bb
|
后台打卡积分打卡详情列表显示错误 bug修改
|
6 years ago |
|
尹作梅
|
59dab3f389
|
活动打卡列表降序显示
|
6 years ago |
|
liuchuang
|
a240d6e011
|
banner图功能优化
|
6 years ago |
|
zhangyongzhangyong
|
c2a4e768bc
|
bug修改
|
6 years ago |
|
尹作梅
|
1aa607bcdc
|
增加活动浏览数bug修改
|
6 years ago |
|
尹作梅
|
230c168cd6
|
去除feignurl
|
6 years ago |
|
尹作梅
|
2550587733
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
b9f206edde
|
取消报名扣积分关联id修改
|
6 years ago |
|
wanggongfeng
|
b4d4069de0
|
干部人员
|
6 years ago |
|
尹作梅
|
66dddc84e4
|
取消报名扣积分+活动更新打卡bug修改
|
6 years ago |
|
wanggongfeng
|
55000fd5c3
|
干部管理
|
6 years ago |
|
zhangyongzhangyong
|
e2c4bebb43
|
增加活动浏览数
|
6 years ago |
|
尹作梅
|
0b68b9630d
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
ff16fb3df8
|
bug#5082修改getCurrentUserStatus
|
6 years ago |
|
yujintao
|
f3982ef73b
|
修改注释
|
6 years ago |
