Merge branch 'ty_fix' into score_shop

Helius

2021-11-12 8b2e015759d11561638bdc0ecae070557b387451

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

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

    /**
     * 结束时间