浏览代码

Merge branch 'test2' into test

anderx 1 年之前
父节点
当前提交
9862df8b87
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -661,7 +661,7 @@
         date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
         a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
         a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames,
-        a.clock_in clockIn,a.assist_process assistProcess,a.tech_start_process techStartProcess
+        ea.total_amount expenseAmount ,a.clock_in clockIn,a.assist_process assistProcess,a.tech_start_process techStartProcess
         from public_release a  left join admin c on a.aid =c.id
         left join expense_account ea ON a.id = ea.prid AND ea.status IN (0, 1, 2, 3)
         <if test="type==2">