Merge remote-tracking branch 'origin/master'

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

@@ -140,7 +140,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
                 .subscribe(object -> {
                     mView.disInventoryDetailFragment(false);
                 }, throwable -> {
-                    ToastUtils.showShort(throwable.getMessage());
+                    ToastUtils.showShort("删除"+throwable.getMessage());
                 });
     }
 

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

@@ -97,12 +97,13 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
                 public void Ok() {
                     mPresenter.cancelInventoryAdd(mCs);
                     deleteInventoryDialog.dismiss();
+                    pop();
                 }
 
                 @Override
                 public void No() {
                     deleteInventoryDialog.dismiss();
-                    mPresenter.exitInventoryAdd();
+                    pop();
                 }
             });
         }