Merge remote-tracking branch 'origin/master'

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

@@ -40,8 +40,8 @@ public class AssReimburseOrder extends StringPropertyUUIDEntity {
 	@Column(name = "OPERATE_STAFF_ID")
 	private String operateStaffId;// 录入员工工号
 	@NotBlank
-	@Column(name = "USER_ID")
-	private String userid;//用户编号
+	@Column(name = "USER_OPEN_ID")
+	private String userOpenId;//用户编号
 	@NotBlank
 	@Column(name = "CARD_ID")
 	private String cardId;//卡号
@@ -62,7 +62,7 @@ public class AssReimburseOrder extends StringPropertyUUIDEntity {
 	@Enumerated(EnumType.STRING)
 	private AuditStatus status;//审核状态
 	@Column(name ="REIMBURSE_FEE")
-	private String reimburseFee;
+	private Integer reimburseFee;
 	@Column(name = "CLOSED_TIME")
 	private LocalDateTime closedTime;//关闭时间
 	@Column(name = "CLOSED_STAFF_ID")