Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml

@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectBasicCanteenSuggestionVo">
         select bcs.suggestion_id, bcs.user_id, bcs.content, bcs.canteen_id, bcs.contact_tel, bcs.reply_content,
-               bcs.reply_state, bcs.reply_user_id, bcs.create_by, bcs.create_time, bcs.update_by, bcs.update_time,
+               bcs.reply_state, bcs.reply_user_id, su.nick_name as create_by, bcs.create_time, bcs.update_by, bcs.update_time,
                bc.canteen_name
         from basic_canteen_suggestion bcs
         left join basic_canteen bc on bc.canteen_id = bcs.canteen_id
+        left join sys_user su on su.user_id = bcs.user_id
     </sql>
 
     <select id="selectBasicCanteenSuggestionList" parameterType="com.bonus.canteen.core.basic.domain.BasicCanteenSuggestion" resultMap="BasicCanteenSuggestionResult">