Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_java

srs-workstudy/src/main/resources/mapper/workstudy/QgzxMoneyMapper.xml

@@ -228,7 +228,7 @@
         select * from (
         select t2.* from (
         select a.id,a.stu_post_id,a.total_time,a.apply_sign,a.apply_no,a.apply_time,a.apply_status,
-        a.dept_sign,a.dept_cmt,null as dept_time,a.dept_no,null as high_time,a.high_no,a.high_cmt,a.high_sign,
+        a.dept_sign,a.dept_cmt,a.dept_time,a.dept_no,a.high_time,a.high_no,a.high_cmt,a.high_sign,
         a.final_no,a.final_time,a.final_cmt,a.final_sign,a.audit_remark,null as money,
         b.stu_no,c.post_name,d.dept_name,e.dept_name as stu_dept,
         e.stu_name,e.class_name,e.grade_name,f.name as dept_no_name,