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

src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

             houseList.forEach(e -> {
                 taRaiseHouseList.forEach(r -> {
                     //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId()) && r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)) {
+                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
                         e.setMineLocked("mine");
                     }
                 });