push

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPageResponse.java

@@ -68,4 +68,9 @@ public class ApiSalaryPageResponse {
      */
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
     private LocalDateTime createTime;
+
+    /**
+     * 通用备注
+     */
+    private String remark;
 }
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPushPageResponse.java

@@ -64,4 +64,9 @@ public class ApiSalaryPushPageResponse {
      */
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
     private LocalDateTime createTime;
+
+    /**
+     * 通用备注
+     */
+    private String remark;
 }
 }

yd-csf-service/src/main/resources/mappers/SalaryMapper.xml

@@ -14,6 +14,7 @@
         s.status,
         s.status,
         s.creator_name,
         s.creator_name,
         s.create_time,
         s.create_time,
+        s.remark,
         GROUP_CONCAT(DISTINCT sr.currency ORDER BY sr.currency SEPARATOR ';') AS currencyList
         GROUP_CONCAT(DISTINCT sr.currency ORDER BY sr.currency SEPARATOR ';') AS currencyList
         FROM salary s
         FROM salary s
         LEFT JOIN salary_remittance sr ON s.salary_biz_id = sr.salary_biz_id AND sr.is_deleted = 0
         LEFT JOIN salary_remittance sr ON s.salary_biz_id = sr.salary_biz_id AND sr.is_deleted = 0