merge api_score_merge

Helius

2022-02-10 91e4d0c81321f9ccfec7fca41898a00ff6f57001

 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;