Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-08-13 4adbbcc92293924720429d1fe6eabcc29daf826a

 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;