Commit 6018bc74 by zhangxingmin

push

parent cd5605ca
package com.yd.csf.feign.response.salary; package com.yd.csf.feign.response.salary;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -61,5 +62,6 @@ public class ApiSalaryPushPageResponse { ...@@ -61,5 +62,6 @@ public class ApiSalaryPushPageResponse {
/** /**
* 制作时间(创建时间) * 制作时间(创建时间)
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
} }
...@@ -48,7 +48,9 @@ ...@@ -48,7 +48,9 @@
s.other_remark, s.other_remark,
s.status, s.status,
s.creator_name, s.creator_name,
s.create_time s.create_time,
s.salary_no,
s.remark
from salary s from salary s
<where> <where>
<if test="request.brokerName != null and request.brokerName != ''"> <if test="request.brokerName != null and request.brokerName != ''">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment