2、修改sql报错问题
3、直播类型名称为空 不返回

2、修改分页bug

Merge Request: 新增商品标签功能

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/69?initial=true

Merge Request: 日销数据-日期判断错误

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/64?initial=true

获取平台信息时，取消平台名称

Merge Request: 查询日销数据：默认日期为0点

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/62?initial=true

Merge Request: 修改log日志路径

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/61?initial=true

Merge Request: 日销明细中请求中，返回表+图的格式

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/60?initial=true

Merge Request: 修改DOCKERFILE、添加live环境配置文件

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/57?initial=true

Merge Request: 报表查询近7日数据

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/49?initial=true

Merge Request: 添加Dockerfile

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/48?initial=true

Merge Request: 上传系列、口味、明细等Mapper对象；添加settings.xml

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/47?initial=true

Merge Request: 旺店通门店维护、同步商品系列与口味、创建销售每日明细表以平台维度进行日期类数据的计算

Created By: @李秋林
Accepted By: @李秋林
URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/45?initial=true