From 1d8dd90749c73d48f6048cf8f5eb6c318c9410b1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 17:37:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=96=B9=E5=BC=8F=E4=B8=8E=E5=B9=B4=E7=A7=9F?= =?UTF-8?q?=E9=87=91=E8=B0=83=E6=95=B4=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql | 3 +++ .../java/com/iformall/domain/po/WxPropertyContract.java | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql new file mode 100644 index 000000000..6f87764d3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql @@ -0,0 +1,3 @@ +alter table wx_property_contract +add column rent_input_way smallint(2) DEFAULT 1 comment '租金录入方式1合铺录入2分铺录入', +add column adjust_ratio_way smallint(2) DEFAULT 1 comment '年租金调整方式1按比例2按金额'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 94b59ec05..7b39482d3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -183,6 +183,12 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") private Integer operationType; + @io.swagger.annotations.ApiModelProperty(value = "租金录入方式1合铺录入2分铺录入", name = "rent_input_way") + private Integer rentInputWay; + + @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") + private Integer adjustRatioWay; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC")