Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssDeviceCancel.java

@@ -108,7 +108,7 @@ public class AssDeviceCancel extends AbstractStringPropertyUUIDEntity {
     @Column(name = "PAY_ORDER_NO")
     private String payOrderNo;// 支付订单号
     @Column(name = "PAY_TIME")
-    private Long payTime;// 支付时间;
+    private String payTime;// 支付时间;
     @Column(name = "PAY_FEE")
     private Integer payFee;// 支付金额;
 }