合并

CODE/smart-community/app-api/src/main/resources/mapper/TpShopAppraisalMapper.xml

@@ -188,13 +188,14 @@
      sa.sort,
      sa.STATUS,
      sa.create_user,
-     sa.create_date
+     sa.create_date,
+     sar.update_date
      from tp_shop_appraisal sa
      left join tp_shop_appraisal_replay sar on sa.id = sar.shop_appraisal_id
      where sa.shop_id = #{shopID,jdbcType=INTEGER}
      and sa.community_id = #{communityId,jdbcType=INTEGER}
      and sa.status = 1
-     order by sa.sort desc,sar.update_date desc,sar.create_date desc
+     order by sa.sort desc,sar.update_date desc
 </select>
 
   <select id="evaluateCount" resultType="int">

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopServiceImpl.java

@@ -248,6 +248,7 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 							   .setReplayContent(replayContent)
 							   .setReplayPeople(userElement.getUserName())
 					           .setCreateUser(userElement.getId())
+					           .setUpdateDate(LocalDateTime.now())
 							   .setCreateDate(LocalDateTime.now());
 			shopAppraisalReplayMapper.insert(shopAppraisalReplay);
 		}