Merge Request: 促销计划新增 - 城市经理不可新增

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

Merge Request: 促销计划新增 - 城市经理不可新增

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

Merge Request: 全量同步经销商

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

Merge Request: 全量同步经销商

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

Merge Request: 每天凌晨，同步部门数据，同时同步经销商战区、大区信息

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

Merge Request: 修改经销商所属战区、大区上测试环境

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

（1）更新直营经销商的所属战区ID、战区名
直营经销商所属部门是直属战区（没有经销商级部门），直接将所属部门补充到org信息中
（2）更新直营经销商的所属战区ID、战区名
直营经销商所属部门是直属战区（没有经销商级部门），直接将所属部门补充到org信息中
（3）更新非直营经销商的所属大区ID、大区名
判断是否是重客，如果是重客直接将重客放到大区中
 如果不是重客，直接将所属战区的parent部门放到大区中
（4）直接将所属战区的parent部门放到大区中(目前重客没有直接经销商)

Merge Request: xxl-job指定ip

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

Merge Request: 修改促销任务接口，将intime\outtime转换为datatime

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

Merge Request: 促销计划excel文件上传时，捕捉到异常后日志打印

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

Merge Request: 促销计划excel文件上传时，捕捉到异常后日志打印

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

Merge Request: 创建计划操作人如果是城市经理的话，操作人与归属人必需一致

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

Merge Request: 操作人如果是城市经理的话，操作人与归属人必需一致

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

Merge Request: 城市经理限制创建计划时间先取消，5月再上

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

Merge Request: 在勤策APP - CP计划中，进行稽核任务创建；

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

Merge Request: 稽查任务转换促销执行、未执行状态直接保存中文

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

Merge Request: 稽查任务转换促销执行、未执行状态直接保存中文

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