Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/model/Cs.java

@@ -5,6 +5,7 @@ import com.xingdata.api.print.entity.BaseOrderPrint;
 import com.xingdata.zzdpos.db.DB;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
+import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
 import com.xingdata.zzdpos.ui.marketing.ms.model.BaseBean;
 
 import java.util.ArrayList;
@@ -259,7 +260,7 @@ public class Cs implements BaseOrderPrint, com.xingdata.zzdpos.base.BaseBean {
 
     public String getOperName() {
         if (operName == null) {
-            operName = DB.getInstance().get(MainPresenter.class).where(Oper.class)
+            operName = DB.getInstance().get(InventoryPresenter.class).where(Oper.class)
                     .equalTo("operId", getCreateOperId())
                     .findFirst().getOperName();
         }

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java

@@ -64,8 +64,6 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
                     }
 
                 }
-
-
                 finish();
             }
         });

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryPresenter.java

@@ -33,7 +33,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
 
     @Override
     public void onAttached() {
-
+        this.initRealm();
     }