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

Merge Request: 后台接口获取小程序openid\phone\accessToken

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

后台接口获取小程序openid\phone\accessToken

Merge Request: 修改正式环境redis配置文件

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

Merge Request: 修改正式环境redis配置文件

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

Merge Request: 1、在链路中心操作促销账号；2、促销计划收入系统；3、登录token与链路中心打通

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

修改测试、正式环境配置文件

Merge Request: 更新服务端小版本

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

在计划分页查询时，按照日期、执行状态、上班时间排序

修改配置文件

城市经理新增计划当月不可新增限制删除

1、微信小程序appId\appsecret从后台获取；2、计划列表按日期（同日期按打卡时间）排序

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