Merge remote-tracking branch 'origin/master'

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

@@ -89,5 +89,5 @@ public class JmTuangouMember {
     private Integer uptownId;
 
     @ExcelProperty(value = "门牌号", index = 4)
-    private String lName;
+    private String forName;
 }

whepi-web/src/main/java/com/bofeng/service/JmTuangouMemberService.java

@@ -25,7 +25,7 @@ public class JmTuangouMemberService {
     List<JmTuangouMember> jmTuangouMembers = jmTuangouMemberDao.querMemberListByJmIdXX(queryParam);
     if (jmTuangouMembers != null && jmTuangouMembers.size() > 0) {
       for (JmTuangouMember xq : jmTuangouMembers) {
-        xq.setLName(xq.getRidgepole() + "-" + xq.getUnit() + "-" + xq.getHouseNumber());
+        xq.setForName(xq.getRidgepole() + "-" + xq.getUnit() + "-" + xq.getHouseNumber());
       }
     }
     return jmTuangouMembers;

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

@@ -34,9 +34,6 @@
         INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
         INNER JOIN sys_uptown u on u.uptown_id = c.uptown_id
         where a.user_id in (select user_id from jm_buy where jm_id=#{jmId})
-        <if test="queryProperties!=null and queryProperties!=''">
-            and u.uptown_name like concat('%',#{queryProperties},'%')
-        </if>
         ) y
         on a.user_id=y.user_id
         LEFT JOIN