Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java

@@ -18,6 +18,8 @@ public class MyAdviceListResultDTO implements Serializable {
 
     private String adviceContent;
 
+    private String adviceType;
+
     private List<String> imgList;
 
     @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8")

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java

@@ -156,7 +156,7 @@ public class UserAdviceController {
 
     /**
      * @Description 居民端-我的建议列表
-     * @param map ->pageSize,pageNo
+     * @param dto
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyAdviceListResultDTO>>
      * @Author liushaowen
      * @Date 2020/11/9 17:35

epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml

@@ -46,6 +46,7 @@
     <resultMap id="myAdviceListResultMap" type="com.epmet.dto.result.MyAdviceListResultDTO">
         <id column="id"></id>
         <result property="adviceContent" column="ADVICE_CONTENT"/>
+        <result property="adviceType" column="ADVICE_TYPE"/>
         <result property="adviceTime" column="ADVICE_TIME"/>
         <result property="replyContent" column="REPLY_CONTENT"/>
         <result property="replyTime" column="REPLY_TIME"/>
@@ -53,7 +54,7 @@
     </resultMap>
 
     <select id="myAdviceList" resultMap="myAdviceListResultMap">
-        select id,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
+        select id,advice_type,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
         from user_advice
         where del_flag = 0 and user_id = #{userId}
         order by created_time desc