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/278?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: 稽查任务转换促销执行、未执行状态直接保存中文

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

Merge Request: 稽查任务转换促销执行、未执行状态

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

Merge Request: 创建稽查任务时，计划部分参数放到后端补充

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

Merge Request: 当稽查任务为null时，返回dto为null

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

Merge Request: 创建/修改/查询稽查任务时，jsonarray与varchar两对象之间相互转换

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

创建/修改稽查任务成功后，返回最新的对象，创建失败时返回null

Merge Request: 创建/修改稽查任务成功后，返回最新的对象

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

使用快速获取手机号次数（今日）

Merge Request: 微信小程序快速获取手机号组件防刷（每天最多可以获取5次）

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

重置AppID(小程序ID)、AppSecret

Merge Request: ActivityExamine表添加任务执行状态

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