Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -102,7 +102,7 @@ public class ScanController {
             }
             if (ly) {
                 model.put("doorplate", unit.getRidgepole() + unit.getUnit());
-                model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
+                model.put("door", uptownDoor.getDoorName());
             } else {
                 model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
                 model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());