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

jyy

2021-07-20 b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java

@@ -42,7 +42,7 @@
   private Date orderTime;

   /**
    * 收款
    * calculationType: 1,
    */
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private Date payTime;