Explorar o código

Merge branch 'test' of jishutao/kede-server into prod

anderx %!s(int64=2) %!d(string=hai) anos
pai
achega
5b569ffe51

+ 3 - 3
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -412,9 +412,9 @@
         a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name applyDepName,a.amount,
         c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,a.secondary_type secondaryType,
         a.liquidation_status liquidationStatus, a.remarks,a.check_no checkNo,a.secondary_type_other secondaryTypeOther,
-           date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
-            date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
-            date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
+        a.create_time, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
+        date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
+        date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
         FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
     left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
     left join t_order_mid tm on a.order_no =tm.order_no