diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml index f0587292..48d37869 100644 --- a/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml +++ b/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml @@ -22,10 +22,10 @@ SELECT customer_address_id, customer_id, name, phone, province_id, city_id, country_id, status, - address, create_by, create_time, remark + address, create_by, create_time, remark, is_default FROM customer_address - + @@ -69,7 +69,7 @@ country_id, status, address, - is_default, + is_default, create_by, remark, create_time @@ -90,7 +90,7 @@ - update costomer_address + update customer_address name = #{name}, phone = #{phone}, @@ -98,7 +98,7 @@ city_id = #{cityId}, country_id = #{countryId}, address = #{address}, - is_default = #{isDefault}, + is_default = #{isDefault}, status = #{status}, remark = #{remark}, update_by = #{updateBy}, @@ -107,4 +107,4 @@ where customer_address_id = #{customerAddressId} - \ No newline at end of file + diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java index 728f8d0f..113eb4f4 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java @@ -1,5 +1,6 @@ package com.ghy.payment.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ghy.common.annotation.Excel; import com.ghy.common.core.domain.BaseEntity; import lombok.Data; @@ -40,6 +41,7 @@ public class FinancialMaster extends BaseEntity { private Integer payStatus; @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING) - private String payTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Data payTime; }