diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java index 3c009db..7483312 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java @@ -55,7 +55,7 @@ public class RechargeAudit { private String auditName; //审核人姓名 private Byte type; //类型 private String rejectReason; //驳回理由 - private Integer flag; //是否为员工号 0员工号 1非员工号 + // private Integer flag; //是否为员工号 0员工号 1非员工号 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private String payTime; //支付时间 diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java index 1d04c13..658c8d4 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java @@ -51,7 +51,7 @@ public class RefundAudit { private String auditName; //审核人姓名 private String rejectReason; //驳回理由 private Byte type; //类型 - private Integer flag; //是否为员工号 0-员工号 1-非员工号 + // private Integer flag; //是否为员工号 0-员工号 1-非员工号 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 62fac95..c65d73f 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -59,9 +59,9 @@ left JOIN rate r ON ugr.rate_id = r.id - + AND ugr.jwcode = #{rechargeAudit.jwcode} @@ -121,9 +121,9 @@ left JOIN rate r ON ugr.rate_id = r.id - + AND ugr.jwcode = #{refundAudit.jwcode}