diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql b/mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql new file mode 100644 index 000000000..bba877ef1 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql @@ -0,0 +1 @@ +update wx_merchant set link_line_phone = link_person where link_line_phone is null; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index cd1bc280d..5df35f71d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -52,7 +52,6 @@ public class WxBillDaily extends BaseEntity{ @Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd") @NotNull - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 3cdffd727..7d5ef64bb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -56,7 +56,6 @@ public class WxBillOther extends BaseEntity { private Long pay; @Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd") - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 67c7101f0..512e2ef87 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -55,7 +55,6 @@ public class WxBillOtherDeposit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") private Long pay; - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index d3104113f..a3a41de6d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -68,7 +68,6 @@ public class WxBillProperty extends BaseEntity { private Long pay; @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 17b944a47..8ff241f3c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -67,7 +67,6 @@ public class WxBillRent extends BaseEntity { private Long pay; @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 56603d8ca..93a560831 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -81,7 +81,6 @@ public class WxRentContract extends BaseEntity { private Integer owe; @Transient - @SortColumn(column = "receiveDate") private String receiveDate; @Transient diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 3aab9ada5..6ea91631e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -114,7 +114,6 @@ public class WxBillAll extends BaseEntity { @SortColumn(column = "owe") private Integer owe; @Transient - @SortColumn(column = "receiveDate") private String receiveDate; @Transient @SortColumn(column = "payDate") diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index fd5b78eaa..382e49422 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -145,7 +145,7 @@ order by ${sortColumns} - order by rc.id desc + order by rc.createtime desc,rc.id desc