 尹作梅
|
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 |
李鹏飞
|
fc9dfb8ee2
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
李鹏飞
|
797996833b
|
评价修改
|
6 years ago |
|
尹作梅
|
c1fa95abe2
|
活动报名接口bug修改1
|
6 years ago |
|
尹作梅
|
5a86fdf176
|
活动报名接口bug修改
|
6 years ago |
|
尹作梅
|
4a6fee4821
|
活动报名接口bug修改
|
6 years ago |
|
尹作梅
|
efef100ffa
|
ActUserLog去除actId、userId新增ACT_USER_RELATION_ID（用户活动关系表主键）
|
6 years ago |
|
尹作梅
|
88d2bbdce9
|
getCurrentUserStatus接口修改
|
6 years ago |
|
尹作梅
|
5f7d45cfb0
|
活动详情接口-获取用户当前状态代码优化
|
6 years ago |
|
李鹏飞
|
50d6d7626d
|
修改
|
6 years ago |
|
尹作梅
|
85898fe2cb
|
活动详情接口新增：8进行中
|
6 years ago |
|
wanggongfeng
|
e70cffcfcb
|
代码生成
|
6 years ago |
|
尹作梅
|
d8991eaaf8
|
dao：selectActInfoDetailResultDTO修改
|
6 years ago |
|
尹作梅
|
2a4d5c7aa9
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
36d1b88a1c
|
bug#5074对应修改活动详情接口v1
|
6 years ago |
|
zhangyongzhangyong
|
c0a025d148
|
志愿者管理 性别bug修复
|
6 years ago |
|
尹作梅
|
57cb048063
|
bug#5074对应修改活动详情接口
|
6 years ago |
|
zhangyongzhangyong
|
e84d323f36
|
活动报名 增加是否已报满判断 + 活动列表增加actid查询条件
|
6 years ago |
|
李鹏飞
|
c717a8a1d6
|
活动修改
|
6 years ago |
|
李鹏飞
|
8744430bb7
|
活动修改
|
6 years ago |
|
wanggongfeng
|
ab7a4a508b
|
dept/option表代码生成
|
6 years ago |
yujintao
|
911560c308
|
kpi导入手动打分相关修改
|
6 years ago |
|
李鹏飞
|
74c52b1304
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
李鹏飞
|
7be257ee0f
|
活动修改
|
6 years ago |
|
wanggongfeng
|
b81a6c9178
|
role表生成代码
|
6 years ago |
|
zhangyongzhangyong
|
d4d3a235e6
|
活动报名 更新epdc_act_info的已报名名额
|
6 years ago |
|
尹作梅
|
4f5461e4d9
|
bug#5072爱心互助banner列表接口修改
|
6 years ago |
|
李鹏飞
|
4328d5d30c
|
活动修改
|
6 years ago |
liuchuang
|
ca580bb600
|
修改爱心互助模块Feign配置
|
6 years ago |
|
zhangyongzhangyong
|
c2c48c1c59
|
活动报名 失败 - 问题追踪
|
6 years ago |
|
zhangyongzhangyong
|
dac7251738
|
小程序 招募令、精彩活动列表查询bug修改
|
6 years ago |
|
liuchuang
|
d83a24c19a
|
修改配置文件
|
6 years ago |
曲树通
|
09c223e57b
|
修复党员列表修改bug
|
6 years ago |
|
yujintao
|
24a279e98b
|
添加注释
|
6 years ago |
|
曲树通
|
49dd8710dc
|
通知bug
|
6 years ago |
|
尹作梅
|
9bb0186962
|
yml、pom还原
|
6 years ago |
|
尹作梅
|
57142d4396
|
points模块中pom文件数据库username、password修改
|
6 years ago |
|
尹作梅
|
ec9c43fd4c
|
项目处理详情修改：删除原来的方法
|
6 years ago |
|
liuchuang
|
b6085a10d7
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
3bdedb704f
|
待处理项目处理、吹哨部门下拉框修改
|
6 years ago |
|
yujintao
|
76f1a55b41
|
小程序更换后，更新微信信息和晚上个人秀信息
|
6 years ago |
|
yujintao
|
9271a458a7
|
Merge branch 'test' into dev_1118
# Conflicts:
# esua-epdc/epdc-admin/epdc-admin-server/pom.xml
# esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
# esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
# esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
# esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
# esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
# esua-epdc/epdc-gateway/pom.xml
# esua-epdc/epdc-gateway/src/main/resources/application.yml
# esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
|
6 years ago |
|
曲树通
|
a349603453
|
修改bug 新增所属机构查询功能
|
6 years ago |
