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

jyy

2021-04-20 f50e081f650eb067cce44fce3db64a237fde145b

 zq-erp/src/main/java/com/matrix/system/shopXcx/pojo/ShopOrderQueryPOJO.java

@@ -19,6 +19,10 @@
     * 开始时间
     */
    private String orderBeginTime;
    /**
     * 开始时间
     */
    private String orderTime;

    /**
     * 结束时间