Merge remote-tracking branch 'origin/main' into main

ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml

@@ -127,7 +127,7 @@
             <if test="params.beginIssueTime != null and params.beginIssueTime != '' and params.endIssueTime != null and params.endIssueTime != ''">
                 and Issue_Time between #{params.beginIssueTime} and #{params.endIssueTime}</if>
         </where>
-        GROUP BY	m.create_time desc
+        order BY	m.create_time desc
     </select>
     <select id="selectEhsNoticeMessageByNoticeMessageId" parameterType="Long" resultMap="EhsNoticeMessageResult">
             <include refid="selectEhsNoticeMessageVo"/>