1、打卡选择活动模式；2、活动记录、活动历史记录展示活动模式；

Merge Request: 后台管理分页查询促销员注册信息

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

Merge Request: 小程序涉及战区部门添加重客部门

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

Merge Request: 管理平台-查询记录上报列表

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

Merge Request: 管理后台查询上报数据、新增店铺

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

Merge Request: 添加xxl-job执行器

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

Merge Request: 获取店铺系统名称

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

Merge Request: 新增店铺时添加所属战区/系统

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

Merge Request: 店铺录入时判断数据是否正确

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

打卡查询店铺时，根据当前位置查询店铺/全国查询（前200条）

促销员注册添加所属战区、负责人
促销员手动录入店铺
上报活动数据时，sku销量动态添加、动态展示、在此基础上实现修改、删除功能
促销员手动录入店铺不可重复录入
促销员打卡不可重复打卡
勤策中的终端数据初始化到店铺(promotion_store)表中

Merge Request: 管理后台销量上报添加查询条件

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

管理后台添加查看促销员列表功能

查询店铺时，查询100个店铺

POS机页面凭证图片上传

1、员工登录
2、员工查询审批数据列表
3、员工查询打卡记录列表
4、员工活动数据审批功能（通过，退回）

Merge Request: 员工查看审批列表(分页)查询

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

application-live添加配置