Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/entity/UptownUnit.java

@@ -73,6 +73,8 @@ public class UptownUnit {
 
 
     @TableField(exist = false)
+    private Long reportId;
+    @TableField(exist = false)
     private Integer msStatus;
     @TableField(exist = false)
     private String msStatusStr = "";

whepi-web/src/main/resources/mapper/UptownUnitMapper.xml

@@ -26,7 +26,7 @@
     </select>
 
     <select id="queryMenPaiList" resultType="com.bofeng.entity.UptownUnit">
-        SELECT a.*,c.report_date, c.ms_status,c.safety_num from (
+        SELECT a.*,c.report_date, c.ms_status,c.safety_num,c.report_id from (
           SELECT a.house_id, a.doorplate, a.unit_id,b.unit, b.ridgepole,b.uptown_id FROM `sys_uptown_house` a
           inner JOIN `sys_uptown_unit` b  on a.unit_id=b.unit_id and b.ridgepole=#{ridgepole} and b.unit_id=#{unitId}
           where b.uptown_id=#{uptownId}