Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/SellBuild.java

@@ -11,6 +11,8 @@ import java.util.Date;
 */
 @Data
 public class SellBuild implements Serializable {
+    //推荐指数
+    private Float recommend;
     //载体名称在地图中的经纬度
     private String namePoint;
     //载体详细信息中心经纬度

nngkxxdp/src/main/resources/mapper/HandleMattersDao.xml

@@ -22,7 +22,7 @@
         deptId,create_time
     </sql>
     <select id="findById" resultType="com.example.nngkxxdp.entity.HandleMatters">
-        select hm.id,hm.matters_name,hm.window_num from t_handle_matters hm
+        select hm.id,hm.matters_name,hm.window_num,hm.url from t_handle_matters hm
         where hm.deptId=#{deptId}
     </select>
     <select id="queryCount" resultType="int">

nngkxxdp/src/main/resources/mapper/SellBuildDao.xml

@@ -34,6 +34,7 @@
             <result property="rentalPrice" column="rental_price" jdbcType="VARCHAR"/>
             <result property="namePoint" column="name_point" jdbcType="VARCHAR"/>
             <result property="centerPoint" column="center_point" jdbcType="VARCHAR"/>
+            <result column="recommend" property="recommend" jdbcType="FLOAT"/>
          <association property="parkData" javaType="com.example.nngkxxdp.entity.ParkData">
             <result column="title" property="title"/>
             <result column="id" property="id"/>