Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java

@@ -119,7 +119,7 @@ public class LoginPresenter extends LoginContract.Presenter {
     @Override
     public void downList(View view, int flag, LoadingDialog loadingDialog) {
         Realm realm = DBFactory.getRealm();
-        RealmResults<Oper> opers = realm.where(Oper.class).findAll();
+        RealmResults<Oper> opers = realm.where(Oper.class).equalTo("operStatus", "0").findAll();
         mView.openDownList(view, opers, flag);
     }
 

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -29,7 +29,7 @@ public final class SystemUtil {
      */
     public static String getDeviceModel() {
 //        return DeviceUtils.getModel();
-        return "X990";
+        return "AECRC10";
     }