Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html

@@ -294,8 +294,10 @@
                    queryKey:_this.form.queryKey,
                    startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
                    endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
                    shopId:_this.form.shopId,
                    order:_this.form.order,
                    sort:_this.form.sort,

                }
            },
            search:function(){