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

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

@@ -265,7 +265,7 @@ public class TaHousingResourcesController extends BaseController {
                     //我的认筹
                     if (e.getHouseId().equals(r.getHouseId())) {
                         e.setMineRaise("mine");
-                        if (r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)) {
+                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
                             e.setMineLocked("mine");
                         }
                     }