Merge Request: 打卡时，计划如果已执行，则判断是否单点CP类型

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/194?initial=true

Merge Request: 促销员[今日活动]数据提交审批并判断是否符合审批条件

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/193?initial=true

Merge Request: 当促销类型是mini秀、校园活动，允许计划被多次使用

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/192?initial=true

Merge Request: 促销员今日活动上报数据保存

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/191?initial=true

Merge Request: 根据Phone登录（促销员查询是否存在）

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/190?initial=true

Merge Request: 管理员删除活动记录，关联删除打卡记录，恢复促销计划执行状态

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/185?initial=true

Merge Request: 打卡、任务上报负责人由原来的qc_id修改为manage_employee_info表id

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/184?initial=true

Merge Request: 促销任务、计划分页条件查询时，日期范围时间点确认为开始日期的0点到结果日期的24点前

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/182?initial=true

Merge Request: 1

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/181?initial=true

Merge Request: 促销员登录修改token创建方式，与gateway中修改的验证方式相匹配

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/179?initial=true

Merge Request: 促销员打卡时，关联计划信息；小程序端促销员查询促销计划；

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/177?initial=true

Merge Request: 查询促销计划时，按计划日期排序；修改促销计划时，判断当前账号权限是否正确；

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/176?initial=true

Merge Request: 查询勤策门店，返回门店信息

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/175?initial=true

Merge Request: 创建计划，修改计划（web页面）-城+职

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/174?initial=true

Merge Request: 促销计划按条件，分页查询

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/172

Merge Request: 删除计划做限制计划日期是今日则必需是10点之前，包含过去日期不可删除，非职能角色不可删除他人计划

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/171?initial=true

Merge Request: UUID保存促销计划时，进行区分，并修改保存逻辑

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/169?initial=true

Merge Request: 职能角色上传促销计划，文件名获取修改；修改部分促销计划修改逻辑

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/168?initial=true

Merge Request: 上报计划异常报错信息抛出

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/167?initial=true

Merge Request: 关于计划接口，由用户ID判断权限改为由用户工号判断；根据工号获取人员数据进行补充参数信息

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/166?initial=true