From 94eb0ef17a45e4e6e1947fa7d37a078f8287efbc Mon Sep 17 00:00:00 2001
From: winter <664946893@qq.com>
Date: Mon, 21 Oct 2024 19:48:25 +0800
Subject: [PATCH] fix
---
.../src/main/resources/db/migration/V202410000000001.sql | 2 ++
.../main/java/com/iformall/domain/po/WxFinanceFinish.java | 6 +++---
.../src/main/resources/mapper/WxFinanceFinishMapper.xml | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql
index 829e34eec..010809a81 100644
--- a/mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql
+++ b/mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql
@@ -15,3 +15,5 @@ CREATE TABLE `wx_finance_finish_receive` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表';
+wx_finance_finish back_remark 改成 audit_remark
+
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java
index 7b17ef51d..3c4a6607a 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java
@@ -58,11 +58,11 @@ public class WxFinanceFinish extends TenantEntity {
return null;
}
- @io.swagger.annotations.ApiModelProperty(value = "审核备注", name = "remark")
+ @io.swagger.annotations.ApiModelProperty(value = "备注", name = "remark")
private String remark;
- @io.swagger.annotations.ApiModelProperty(value = "反审核备注", name = "remark")
- private String backRemark;
+ @io.swagger.annotations.ApiModelProperty(value = "审核备注", name = "auditRemark")
+ private String auditRemark;
@io.swagger.annotations.ApiModelProperty(value = "交款开始日期", name = "startDate")
private Date startDate;
diff --git a/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml
index cf8c4c32a..750e874fc 100644
--- a/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml
@@ -13,7 +13,7 @@
-
+
@@ -26,7 +26,7 @@
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,
- `status`,`remark`,`back_remark`,`start_date`,`end_date`,`audit_time`,`audit_by`,`audit_by_name`,`buildings,`fees`,`payways`
+ `status`,`remark`,`audit_remark`,`start_date`,`end_date`,`audit_time`,`audit_by`,`audit_by_name`,`buildings,`fees`,`payways`