Merge Request: 删除计划时判断是否有不能删除的计划，如果有则报错

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

Merge Request: 删除计划时判断是否有不能删除的计划，如果有则报错

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

Merge Request: 删除计划时判断是否有不能删除的计划，如果有则报错

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

Merge Request: 同步勤策门店：系统名称（CVS\KA并且是连锁的店直接用系统名称，否则同步门店类型）

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

Merge Request: 同步勤策门店：系统名称（CVS\KA并且是连锁的店直接用系统名称，否则同步门店类型）

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

Merge Request: 同步勤策门店：系统名称（CVS\KA并且是连锁的店直接用系统名称，否则同步门店类型）

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

Merge Request: 同步勤策数据时间间隔修改

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

Merge Request: 同步勤策数据时间间隔修改

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

Merge Request: 1、修改多个计划 - 归属人；2、修改计划（web页面）-城+职都可以修改归属人；3、全量同步经销商

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

Merge Request: 1、修改多个计划 - 归属人；2、修改计划（web页面）-城+职都可以修改归属人；3、全量同步经销商

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

计划2版本，修改计划时保存修改人

Merge Request: 计划2版本，修改计划时保存修改人

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

1、勤策全量修改人员、部门信息；2、促销员计划V2版打卡依据计划打卡新增接口

勤策全量修改人员、部门信息

Merge Request: 促销员打卡依据计划打卡新增接口

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

新增任务关联活动形式ID\查询销售数据是否满足提交审批的条件\促销员打卡-选择店铺修改为原逻辑

Merge Request: 新增任务关联活动形式ID

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

Merge Request: 查询销售数据是否满足提交审批的条件

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

Merge Request: 促销员打卡-选择店铺修改为原逻辑

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

促销后台员工登录token修改为gateway解析同一个逻辑

促销后台员工登录token修改为gateway解析同一个逻辑

取消注册验证码校验

Merge Request: 取消注册验证码校验

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