Commits · 64b026e3fb03d3b9b09bb062b7ebc84304faef2f · AutogeneralShanghai / yd-backend · GitLab

22 Oct, 2020 1 commit
- Merge remote-tracking branch 'origin/dev_20200908_PEP_Statistics' into dev · 64b026e3
  Simon Cheng committed Oct 22, 2020
  
  64b026e3 Browse Files
21 Oct, 2020 3 commits
- 日程365天bug · 0b9b07a8
  jianan committed Oct 21, 2020
  
  0b9b07a8 Browse Files
- 长期固定日程期限为下一个365天 · baa54dee
  jianan committed Oct 21, 2020
  
  baa54dee Browse Files
- 去除日程时间段冲突限制，添加同类型日程同时间段限制 · 132ce465
  jianan committed Oct 21, 2020
  
  132ce465 Browse Files
15 Oct, 2020 1 commit
- Merge branch 'dev_20200908_PEP_Statistics' into dev · b6b589bb
  jianan committed Oct 15, 2020
  
  b6b589bb Browse Files
29 Sep, 2020 1 commit
- 日程时间冲突从当日显示日程列表中检测2.0 · 41032b4b
  jianan committed Sep 29, 2020
  
  41032b4b Browse Files
28 Sep, 2020 4 commits
- 日程时间冲突从当日显示日程列表中检测 · 7e9db769
  jianan committed Sep 28, 2020
  
  7e9db769 Browse Files
- Merge branch 'dev_20200908_PEP_Statistics' into dev · 054cfe2c
  jianan committed Sep 28, 2020
  
  054cfe2c Browse Files
- 日程列表查询显示增员姓名 · 12a6b97d
  jianan committed Sep 28, 2020
  
  12a6b97d Browse Files
- 个人得分详情mdDropOptionId通过查询获取 · 610b93da
  jianan committed Sep 28, 2020
  
  610b93da Browse Files
27 Sep, 2020 1 commit
- 日程列表查询加姓名电话 · ab855d8d
  jianan committed Sep 27, 2020
  
  ab855d8d Browse Files
24 Sep, 2020 12 commits
- Merge branch 'dev_20200908_PEP_Statistics' into dev · 8233e064
  jianan committed Sep 24, 2020
  
  8233e064 Browse Files
- 长期固定得分 · a56838e0
  jianan committed Sep 24, 2020
  
  a56838e0 Browse Files
- Merge branch 'dev_20200908_PEP_Statistics' into dev · 9bc9e5b7
  jianan committed Sep 24, 2020
  
  9bc9e5b7 Browse Files
- PEP得分 · 1fb764ed
  jianan committed Sep 24, 2020
  
  1fb764ed Browse Files
- Merge branch 'dev_20200908_PEP_Statistics' into dev · 738cd597
  jianan committed Sep 24, 2020
  
  738cd597 Browse Files
- 活动时间冲突 · cd000442
  jianan committed Sep 24, 2020
  
  cd000442 Browse Files
- Merge remote-tracking branch 'origin/dev_20200908_PEP_Statistics' into dev · 337034b7
  Simon Cheng committed Sep 24, 2020
  
  337034b7 Browse Files
- 删掉打印 · 32045435
  jianan committed Sep 24, 2020
  
  32045435 Browse Files
- 个人详情本周分值 · d03aa195
  jianan committed Sep 24, 2020
  
  d03aa195 Browse Files
- PEP本周分值 · 02e3a55d
  jianan committed Sep 24, 2020
  
  02e3a55d Browse Files
- 10.添加一项任务，时间在 24号，9：00-10：00，保存后，再次添加25号 8：00- 10：00的任务，保存，提示：message: "活动时间段冲突" · 55f2e02c
```
11.今天24号添加的任务，分值没有计在今天
12. 25号添加的任务，分值没有统计在本周
13.还有本周比本月分值高
```
  jianan committed Sep 24, 2020
  55f2e02c Browse Files
- 日程列表查询 · 09bd1a81
  jianan committed Sep 24, 2020
  
  09bd1a81 Browse Files
23 Sep, 2020 11 commits
- 活动时间最终 · 489468c8
  jianan committed Sep 23, 2020
  
  489468c8 Browse Files
- 活动时间6 · ed01a8e0
  jianan committed Sep 23, 2020
  
  ed01a8e0 Browse Files
- 活动时间5 · 1d9b1382
  jianan committed Sep 23, 2020
  
  1d9b1382 Browse Files
- 活动时间4 · fde8906e
  jianan committed Sep 23, 2020
  
  fde8906e Browse Files
- 活动时间3 · 6c1db0eb
  jianan committed Sep 23, 2020
  
  6c1db0eb Browse Files
- 活动时间2 · 09dd6481
  jianan committed Sep 23, 2020
  
  09dd6481 Browse Files
- 活动时间 · 7fe9ea93
  jianan committed Sep 23, 2020
  
  7fe9ea93 Browse Files
- 线上线下FYC和活动时间 · cb936495
  jianan committed Sep 23, 2020
  
  cb936495 Browse Files
- FYC · 671f64e0
```
PEP得分不正确
```
  jianan committed Sep 23, 2020
  671f64e0 Browse Files
- FYC · 1f7f23f1
```
FYC不正确
```
  jianan committed Sep 23, 2020
  1f7f23f1 Browse Files
- 线上FYC和线下FYC合计 · eb2d934a
  jianan committed Sep 23, 2020
  
  eb2d934a Browse Files
22 Sep, 2020 3 commits
- 时间段冲突规则不对 · 7d54e977
  jianan committed Sep 22, 2020
  
  7d54e977 Browse Files
- 个人得分详情，辅导，培训，会议分数不对 · f24de6a9
  jianan committed Sep 22, 2020
  
  f24de6a9 Browse Files
- 添加【其他】下标签任务，活动量分值没有对应增加 · b8ecf83c
  jianan committed Sep 22, 2020
  
  b8ecf83c Browse Files
21 Sep, 2020 3 commits
- 日程修改bug修复 · 73731bd5
  jianan committed Sep 21, 2020
  
  73731bd5 Browse Files
- 日程修改删除同步商机和增员 · c6890591
  jianan committed Sep 21, 2020
  
  c6890591 Browse Files
- 日程列表查询修改时间段格式 · d9c23c2c
  jianan committed Sep 21, 2020
  
  d9c23c2c Browse Files