Merge remote-tracking branch 'origin/master'

zouyu

2023-11-15 54cce185f383849322d5cc309d2ee5d155d15915

 mes-basic/src/main/resources/mapper/StaffMapper.xml

@@ -115,4 +115,8 @@
      where
      u.user_id = #{userId}
   </select>
    <select id="chooseStaff" resultType="java.util.Map">
      select id,staff_no "staffNo", staff_name "staffName"
      from basic_staff
   </select>
</mapper>