Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
94eb0ef17a
3 zmienionych plików z 7 dodań i 5 usunięć
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V202410000000001.sql Wyświetl plik

@@ -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


+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java Wyświetl plik

@@ -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;


+ 2
- 2
mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml Wyświetl plik

@@ -13,7 +13,7 @@
<result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="back_remark" jdbcType="VARCHAR" property="backRemark"/>
<result column="audit_remark" jdbcType="VARCHAR" property="auditRemark"/>
<result column="start_date" jdbcType="TIMESTAMP" property="startDate"/>
<result column="end_date" jdbcType="TIMESTAMP" property="endDate"/>
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime"/>
@@ -26,7 +26,7 @@

<sql id="allColumns">
`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`
</sql>

<sql id="dynamicWhereConditions">


Ładowanie…
Anuluj
Zapisz