新增 食谱，每日食谱记录

ruoyi-system/src/main/resources/mapper/system/MenuFoodMapper.xml

@@ -61,6 +61,7 @@
             <if test="canteenId != null ">and canteen_id = #{canteenId}</if>
             <if test="isUse != null  and isUse != ''">and is_use = #{isUse}</if>
         </where>
+        order by menu_food_time,is_use DESC
     </select>
 
     <select id="selectMenuFoodByMenuFoodId" parameterType="Long" resultMap="MenuFoodResult">

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
     <select id="getUserInfoList" parameterType="Long" resultMap="SysUserVoResult">
-		select user_id, user_name,phonenumber,avatar from sys_user where user_id in
+		select user_id, user_name,nick_name,phonenumber,avatar from sys_user where user_id in
 		<foreach collection="array" item="userId" open="(" separator="," close=")">
 			#{userId}
 		</foreach>