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

doum

昨天 6cf36f0e43c9add691b9a375526ce7dc26209574

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/dao/CabinetGridDao.java

@@ -69,7 +69,7 @@
    List<CabinetGridDo> getGridByOpenStatus(int isOpen);

    @Transaction
    @Query("SELECT * FROM cabinet_grid WHERE is_open = 1 and working_status = 0 and grid_status = 0 order by grid_key asc")
    @Query("SELECT * FROM cabinet_grid WHERE is_open = 1 and working_status = 0 and grid_status = 0  and key_status !=3 order by grid_key asc")
    List<CabinetGridDo> getOpenGrids();

    @Transaction