Merge branch 'dev' into test

share-system/src/main/resources/mapper/system/DurationLogMapper.xml

@@ -24,6 +24,7 @@
         <result property="newNickName" column="new_nick_name"/>
         <result property="newPhone" column="new_phone"/>
         <result property="newAvatar" column="new_avatar"/>
+        <result property="newId" column="new_id"/>
     </resultMap>
 
     <sql id="selectDurationLogVo">
@@ -62,7 +63,8 @@
         d.duration_type,
         e.nick_name as new_nick_name,
         e.phone as new_phone,
-        e.avatar as new_avatar
+        e.avatar as new_avatar,
+        e.id as new_id
         from s_duration_log d join s_consumer c on d.consumer_id = c.id
         left join s_consumer e on d.new_id = e.id
         <where>