Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-29 35cea8fd3552a048ed49d0596b647c983e148644

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

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

    /**
     * 结束时间