Merge branch 'ty_fix' into alpha

Helius

2021-11-11 38878823430a2aec4ae7ceb942562bb9e2de2af4

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

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

    /**
     * 结束时间