Merge branch 'score_shop' into api_score_meger

Helius

2021-11-12 ad3359e6dbce223c77f359495e0067c57e14fc20

 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;