Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/resources/mapper/bgt/BgtMessageMapper.xml

@@ -25,5 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
+    <select id="queryOtherPageList" resultType="com.ruoyi.bgt.domain.vo.BgtMessageOtherVO">
+
+
+
+
+    </select>
 
 </mapper>

ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 wu.score,
                 wu.avatar_name,
                 wu.username,
+                bpra.status,
                 wu.type_of_work,
                 bpr.recruit_name,
                 fpt.task_name
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
+        order by  bpra.create_time desc,bpra.status asc
     </select>
 
     <select id="todayAttendanceList" resultType="com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO">