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

# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantExpandInfoUtils.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/ColorBeanDao.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/table/RiceponAddOrderBean.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java

base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java

@@ -30,13 +30,13 @@ import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler;
 import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
 import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
 import com.gingersoft.gsa.cloud.base.utils.xlog.MyBackupStrategy;
-import com.gingersoft.gsa.cloud.bean.RestaurantExpandInfo;
 import com.gingersoft.gsa.cloud.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.constans.PrintConstans;
 import com.gingersoft.gsa.cloud.constans.UserConstans;
 import com.gingersoft.gsa.cloud.database.DaoManager;
 import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
 import com.gingersoft.gsa.cloud.database.utils.ExpandInfoDaoUtils;
+import com.gingersoft.gsa.cloud.table.RestaurantExpandInfo;
 import com.hyweb.n5.lib.exception.NoInitPrinterException;
 import com.hyweb.n5.lib.util.PrinterUtil;
 import com.jess.arms.base.BaseApplication;
@@ -105,7 +105,7 @@ public class GsaCloudApplication extends BaseApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        mAppContext = this;
+        this.mAppContext = this;
         CC.enableVerboseLog(true);
         CC.enableDebug(true);
         CC.enableRemoteCC(true);
@@ -227,8 +227,6 @@ public class GsaCloudApplication extends BaseApplication {
         RetrofitUrlManager.getInstance().putDomain("ricepon_activities", HttpsConstans.ricepon_activities);
         ///ricepon-cloud-gsa/api/請求地址
         RetrofitUrlManager.getInstance().putDomain("ricepon_cloud_gsa", HttpsConstans.ricepon_cloud_gsa);
-        //61177
-        RetrofitUrlManager.getInstance().putDomain("ricepon_member", HttpsConstans.RICEPON_MEMBER_61177);
     }
 
     private void initPrint() {

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantExpandInfoUtils.java

@@ -3,7 +3,8 @@ package com.gingersoft.gsa.cloud.base.utils;
 import android.text.TextUtils;
 
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.bean.RestaurantExpandInfo;
+import com.gingersoft.gsa.cloud.table.RestaurantExpandInfo;
+import com.gingersoft.gsa.cloud.constans.ExpandConstant;
 import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
 
 import java.lang.reflect.Field;
@@ -35,40 +36,40 @@ public class RestaurantExpandInfoUtils {
      * @param expandInfoList
      */
     public static void setCommonExpandInfo(List<ExpandInfo> expandInfoList) {
-//        for (ExpandInfo expandInfo : expandInfoList) {
-//            switch (expandInfo.getSettingName()) {
-//                case ExpandConstant.Rounding:
-//                    MoneyUtil.rounding = expandInfo.getValueInt();
-//                    break;
-//                case ExpandConstant.RoundingDecimal:
-//                    MoneyUtil.RoundingDecimal = expandInfo.getValueInt();
-//                    break;
-//                case ExpandConstant.ItemDecimals:
-//                    MoneyUtil.ItemDecimals = expandInfo.getValueInt();
-//                    break;
-//                case ExpandConstant.ToPrintQRCode:
-//                case ExpandConstant.MergeSendFood:
-//                case ExpandConstant.AutoPrinterPaper:
-//                case ExpandConstant.PrintMemberInfo:
-//                case ExpandConstant.PrintPage:
-//                case ExpandConstant.PrintMergerFood:
-//                case ExpandConstant.PrintStatisticsAmount:
-//                case ExpandConstant.PrintFirstOrder:
-//                case ExpandConstant.FrozenChainAutoOrder:
-//                    map.put(expandInfo.getSettingName(), expandInfo.getValueInt() == 0);
-//                    idMaps.put(expandInfo.getSettingName(), expandInfo.getId());
-//                    break;
-//                case ExpandConstant.OrderReceivingTimeout:
-//                case ExpandConstant.DeliveryPrintCount:
-//                case ExpandConstant.DeliveryClosingPC:
-//                case ExpandConstant.TableModePrintCount:
-//                case ExpandConstant.TableModeClosingPC:
-//                    map.put(expandInfo.getSettingName(), expandInfo.getValueInt());
-//                    idMaps.put(expandInfo.getSettingName(), expandInfo.getId());
-//                    break;
-//            }
-//        }
-//
+        for (ExpandInfo expandInfo : expandInfoList) {
+            switch (expandInfo.getSettingName()) {
+                case ExpandConstant.Rounding:
+                    MoneyUtil.rounding = expandInfo.getValueInt();
+                    break;
+                case ExpandConstant.RoundingDecimal:
+                    MoneyUtil.RoundingDecimal = expandInfo.getValueInt();
+                    break;
+                case ExpandConstant.ItemDecimals:
+                    MoneyUtil.ItemDecimals = expandInfo.getValueInt();
+                    break;
+                case ExpandConstant.ToPrintQRCode:
+                case ExpandConstant.MergeSendFood:
+                case ExpandConstant.AutoPrinterPaper:
+                case ExpandConstant.PrintMemberInfo:
+                case ExpandConstant.PrintPage:
+                case ExpandConstant.PrintMergerFood:
+                case ExpandConstant.PrintStatisticsAmount:
+                case ExpandConstant.PrintFirstOrder:
+                case ExpandConstant.FrozenChainAutoOrder:
+                    map.put(expandInfo.getSettingName(), expandInfo.getValueInt() == 0);
+                    idMaps.put(expandInfo.getSettingName(), expandInfo.getId());
+                    break;
+                case ExpandConstant.OrderReceivingTimeout:
+                case ExpandConstant.DeliveryPrintCount:
+                case ExpandConstant.DeliveryClosingPC:
+                case ExpandConstant.TableModePrintCount:
+                case ExpandConstant.TableModeClosingPC:
+                    map.put(expandInfo.getSettingName(), expandInfo.getValueInt());
+                    idMaps.put(expandInfo.getSettingName(), expandInfo.getId());
+                    break;
+            }
+        }
+
         for (ExpandInfo expandInfo : expandInfoList) {
             if (expandInfo.getDataType() == ExpandInfo.data_type_int) {
                 map.put(expandInfo.getSettingName(), expandInfo.getValueInt());
@@ -140,15 +141,6 @@ public class RestaurantExpandInfoUtils {
 
     public static <T> T getValue(String name, Object defaultValue) {
         if (map != null && map.containsKey(name)) {
-            if (defaultValue instanceof Boolean) {
-                if (map.get(name) instanceof Boolean) {
-                    return (T) map.get(name);
-                } else if (map.get(name) instanceof Integer) {
-                    map.put(name, (int) map.get(name) == 0);
-                } else {
-                    return (T) defaultValue;
-                }
-            }
             return (T) map.get(name);
         } else {
             return (T) defaultValue;

base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/ColorBeanDao.java

@@ -3,13 +3,13 @@ package com.gingersoft.gsa.cloud.database.greendao;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteStatement;
 
-import com.gingersoft.gsa.cloud.database.bean.ColorBean;
-
 import org.greenrobot.greendao.AbstractDao;
 import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
 import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.gingersoft.gsa.cloud.database.bean.ColorBean;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /** 

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/PublicBean.java → base-module/src/main/java/com/gingersoft/gsa/cloud/table/PublicBean.java

-package com.gingersoft.gsa.cloud.bean;
+package com.gingersoft.gsa.cloud.table;
 
 public class PublicBean {
     private boolean success;

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/RestaurantExpandInfo.java → base-module/src/main/java/com/gingersoft/gsa/cloud/table/RestaurantExpandInfo.java

-package com.gingersoft.gsa.cloud.bean;
+package com.gingersoft.gsa.cloud.table;
 
 import lombok.Data;
 

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/WiseposBean.java → base-module/src/main/java/com/gingersoft/gsa/cloud/table/WiseposBean.java

-package com.gingersoft.gsa.cloud.bean;
+package com.gingersoft.gsa.cloud.table;
 
 public class WiseposBean {
 

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/contract/OrderDetailsContract.java

@@ -4,7 +4,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.CancelLogisticsBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ReadBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
 import com.jess.arms.mvp.IModel;
 import com.jess.arms.mvp.IView;

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/model/OrderDetailsModel.java

@@ -8,7 +8,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.ReadBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
 import com.gingersoft.coldchain_module.mvp.model.service.OrderDetailService;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.ActivityScope;

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/model/service/OrderDetailService.java

@@ -4,7 +4,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.CancelLogisticsBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ReadBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
 
 import io.reactivex.Observable;

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderDetailsPresenter.java

@@ -14,7 +14,7 @@ import com.gingersoft.gsa.cloud.base.utils.FileUtils;
 import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
 import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/contract/BaseLoginContract.java

 package com.gingersoft.gsa.cloud.login.mvp.contract;
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/model/BaseLoginModel.java

@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.login.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.contract.BaseLoginContract;
 import com.gingersoft.gsa.cloud.login.mvp.server.LoginService;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java

@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils;
 import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
 import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.constans.AppConstans;
 import com.gingersoft.gsa.cloud.constans.PrintConstans;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/server/LoginService.java

 package com.gingersoft.gsa.cloud.login.mvp.server;
 
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
 

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/contract/ChooseRestaurantContract.java

 package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.contract;
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
 import com.jess.arms.mvp.IView;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/model/ChooseRestaurantModel.java

@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.server.LoginService;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
 import com.google.gson.Gson;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/presenter/ChooseRestaurantPresenter.java

@@ -4,7 +4,7 @@ import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.contract.ChooseRestaurantContract;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;

print-module/src/main/java/com/joe/print/mvp/contract/LocalPrintContract.java

 package com.joe.print.mvp.contract;
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;

print-module/src/main/java/com/joe/print/mvp/contract/PrintAddCurrencyContract.java

 package com.joe.print.mvp.contract;
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;
 

print-module/src/main/java/com/joe/print/mvp/model/LocalPrintModel.java

@@ -2,7 +2,7 @@ package com.joe.print.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.google.gson.Gson;
 import com.jess.arms.integration.IRepositoryManager;
 import com.jess.arms.mvp.BaseModel;

print-module/src/main/java/com/joe/print/mvp/model/PrintAddCurrencyModel.java

@@ -2,7 +2,7 @@ package com.joe.print.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.google.gson.Gson;
 import com.jess.arms.integration.IRepositoryManager;
 import com.jess.arms.mvp.BaseModel;

print-module/src/main/java/com/joe/print/mvp/model/server/PrintInfoService.java

@@ -2,7 +2,7 @@ package com.joe.print.mvp.model.server;
 
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 
 import io.reactivex.Observable;
 import me.jessyan.retrofiturlmanager.RetrofitUrlManager;

print-module/src/main/java/com/joe/print/mvp/presenter/LocalPrintPresenter.java

@@ -3,7 +3,7 @@ package com.joe.print.mvp.presenter;
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
 import com.jess.arms.di.scope.FragmentScope;
 import com.jess.arms.http.imageloader.ImageLoader;

print-module/src/main/java/com/joe/print/mvp/presenter/PrintAddCurrencyPresenter.java

@@ -3,7 +3,7 @@ package com.joe.print.mvp.presenter;
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
-import com.gingersoft.gsa.cloud.bean.PublicBean;
+import com.gingersoft.gsa.cloud.table.PublicBean;
 import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;

table-module/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gingersoft.gsa.cloud.bean">
+    package="com.gingersoft.gsa.cloud.table">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />

table-module/src/main/debug/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gingersoft.gsa.cloud.bean">
+    package="com.gingersoft.gsa.cloud.table">
 
     <application
         android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication"
@@ -10,10 +10,10 @@
         android:supportsRtl="true"
         android:networkSecurityConfig="@xml/network_android"
         android:theme="@style/AppTheme">
-        <activity android:name="com.gingersoft.gsa.cloud.bean.mvp.ui.activity.orderManager.OrderDetailActivity"/>
-        <activity android:name="com.gingersoft.gsa.cloud.bean.mvp.ui.activity.orderManager.OrderCenterActivity" />
-        <activity android:name="com.gingersoft.gsa.cloud.bean.mvp.ui.activity.SoldoutCtrlActivity" />
-        <activity android:name="com.gingersoft.gsa.cloud.bean.mvp.ui.activity.TableActivity">
+        <activity android:name="com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderDetailActivity"/>
+        <activity android:name="com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity" />
+        <activity android:name="com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity" />
+        <activity android:name="com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/ComponentTable.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/ComponentTable.java

-package com.gingersoft.gsa.cloud.bean;
+package com.gingersoft.gsa.cloud.table;
 
 import com.billy.cc.core.component.CC;
 import com.billy.cc.core.component.CCResult;
 import com.billy.cc.core.component.CCUtil;
 import com.billy.cc.core.component.IComponent;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.MealStandActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
 import com.gingersoft.gsa.cloud.function.FModule;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.SoldoutCtrlActivity;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.orderManager.OrderCenterActivity;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.OrderPayActivity;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.TableActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
 
 public class ComponentTable implements IComponent {
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/PayConstant.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/PayConstant.java

-package com.gingersoft.gsa.cloud.bean.app.payment;
+package com.gingersoft.gsa.cloud.table.app.payment;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/AdjustTipRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/AdjustTipRequest.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/AdjustTipRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/AdjustTipRespose.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/PayRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/PayRequest.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/RefundRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/RefundRequest.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/RefundRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/RefundRespose.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/RetrievalRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/RetrievalRequest.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/RetrievalRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/RetrievalRespose.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/SaleRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/SaleRespose.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/SettlementRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/SettlementRequest.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/SettlementRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/SettlementRespose.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/VoidRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/VoidRequest.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/VoidRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/VoidRespose.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/WaitRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/WaitRequest.java

-package com.gingersoft.gsa.cloud.bean.app.payment.bean;
+package com.gingersoft.gsa.cloud.table.app.payment.bean;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/callback/CommandImpl.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/callback/CommandImpl.java

-package com.gingersoft.gsa.cloud.bean.app.payment.callback;
+package com.gingersoft.gsa.cloud.table.app.payment.callback;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,7 +7,7 @@ import com.elvishew.xlog.XLog;
 import com.etps.aca.lib.action.ICommand;
 import com.etps.aca.lib.constant.Constant;
 import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.OrderPayActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.utils.ArmsUtils;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/contract/IN5Action.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/contract/IN5Action.java

-package com.gingersoft.gsa.cloud.bean.app.payment.contract;
+package com.gingersoft.gsa.cloud.table.app.payment.contract;
 
 import android.content.Context;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.AdjustTipRequest;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.PayRequest;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.RefundRequest;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.RetrievalRequest;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.SettlementRequest;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.VoidRequest;
-import com.gingersoft.gsa.cloud.bean.app.printer.PrintPaymentStub;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.AdjustTipRequest;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.PayRequest;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.RefundRequest;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.RetrievalRequest;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.SettlementRequest;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.VoidRequest;
+import com.gingersoft.gsa.cloud.table.app.printer.PrintPaymentStub;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/contract/IN5Callback.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/contract/IN5Callback.java

-package com.gingersoft.gsa.cloud.bean.app.payment.contract;
+package com.gingersoft.gsa.cloud.table.app.payment.contract;
 
 
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.AdjustTipRespose;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.RefundRespose;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.RetrievalRespose;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.SaleRespose;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.SettlementRespose;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.VoidRespose;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.AdjustTipRespose;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.RefundRespose;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.RetrievalRespose;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.SaleRespose;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.SettlementRespose;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.VoidRespose;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/util/PayMethodFilterUtils.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/util/PayMethodFilterUtils.java

-package com.gingersoft.gsa.cloud.bean.app.payment.util;
+package com.gingersoft.gsa.cloud.table.app.payment.util;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/printer/PrintPaymentStub.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/printer/PrintPaymentStub.java

-package com.gingersoft.gsa.cloud.bean.app.printer;
+package com.gingersoft.gsa.cloud.table.app.printer;
 
 /**
  * 作者：ELEGANT_BIN

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/AllOrderComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/AllOrderComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.AllOrderModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.AllOrderContract;
+import com.gingersoft.gsa.cloud.table.di.module.AllOrderModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract;
 
 import com.jess.arms.di.scope.FragmentScope;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.AllOrderFragment;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/AllTableComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/AllTableComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.AllTableModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.AllTableContract;
+import com.gingersoft.gsa.cloud.table.di.module.AllTableModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.AllTableContract;
 
 import com.jess.arms.di.scope.FragmentScope;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.AllTableFragment;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/FineItemAllComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/FineItemAllComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.FineItemAllModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.FineItemAllContract;
+import com.gingersoft.gsa.cloud.table.di.module.FineItemAllModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.FineItemAllContract;
 
 import com.jess.arms.di.scope.FragmentScope;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.FineItemAllFragment;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.FineItemAllFragment;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/FineItemOneselfComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/FineItemOneselfComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.FineItemOneselfContract;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.FineItemOneselfFragment;
+import com.gingersoft.gsa.cloud.table.mvp.contract.FineItemOneselfContract;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.FineItemOneselfFragment;
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.FineItemOneselfModule;
+import com.gingersoft.gsa.cloud.table.di.module.FineItemOneselfModule;
 
 import com.jess.arms.di.scope.FragmentScope;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/InputTableComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/InputTableComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.InputTableModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.InputTableContract;
+import com.gingersoft.gsa.cloud.table.di.module.InputTableModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.InputTableContract;
 
 import com.jess.arms.di.scope.FragmentScope;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.InputTableFragment;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.InputTableFragment;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/MealStandComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealStandComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
-import com.gingersoft.gsa.cloud.bean.di.module.MealStandModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.MealStandContract;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.MealStandActivity;
+import com.gingersoft.gsa.cloud.table.di.module.MealStandModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.di.scope.ActivityScope;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/OrderCenterComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/OrderCenterComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.OrderCenterModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderCenterContract;
+import com.gingersoft.gsa.cloud.table.di.module.OrderCenterModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
 
 import com.jess.arms.di.scope.ActivityScope;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.orderManager.OrderCenterActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/OrderContentComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/OrderContentComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
-import com.gingersoft.gsa.cloud.bean.di.module.OrderContentModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderContentContract;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.OrderContentActivity;
+import com.gingersoft.gsa.cloud.table.di.module.OrderContentModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.di.scope.ActivityScope;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/OrderDetailComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/OrderDetailComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.OrderDetailModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderDetailContract;
+import com.gingersoft.gsa.cloud.table.di.module.OrderDetailModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderDetailContract;
 
 import com.jess.arms.di.scope.ActivityScope;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.orderManager.OrderDetailActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderDetailActivity;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/OrderPayComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/OrderPayComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
-import com.gingersoft.gsa.cloud.bean.di.module.OrderPayModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderPayContract;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.OrderPayActivity;
+import com.gingersoft.gsa.cloud.table.di.module.OrderPayModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.di.scope.ActivityScope;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/SoldoutCtrlComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/SoldoutCtrlComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
-import com.gingersoft.gsa.cloud.bean.di.module.SoldoutCtrlModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.SoldoutCtrlContract;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.SoldoutCtrlActivity;
+import com.gingersoft.gsa.cloud.table.di.module.SoldoutCtrlModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.SoldoutCtrlContract;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.di.scope.ActivityScope;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/StateTableComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/StateTableComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.StateTableModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.StateTableContract;
+import com.gingersoft.gsa.cloud.table.di.module.StateTableModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.StateTableContract;
 
 import com.jess.arms.di.scope.FragmentScope;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.StateTableFragment;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.StateTableFragment;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/TableComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/TableComponent.java

-package com.gingersoft.gsa.cloud.bean.di.component;
+package com.gingersoft.gsa.cloud.table.di.component;
 
 import dagger.BindsInstance;
 import dagger.Component;
 
 import com.jess.arms.di.component.AppComponent;
 
-import com.gingersoft.gsa.cloud.bean.di.module.TableModule;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.TableContract;
+import com.gingersoft.gsa.cloud.table.di.module.TableModule;
+import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
 
 import com.jess.arms.di.scope.ActivityScope;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.TableActivity;
+import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/AllOrderModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/AllOrderModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.AllOrderContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.AllOrderModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.AllOrderModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/AllTableModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/AllTableModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.AllTableContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.AllTableModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.AllTableContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.AllTableModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/FineItemAllModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/FineItemAllModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.FineItemAllContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.FineItemAllModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.FineItemAllContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.FineItemAllModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/FineItemOneselfModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/FineItemOneselfModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.FineItemOneselfContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.FineItemOneselfModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.FineItemOneselfContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.FineItemOneselfModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/InputTableModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/InputTableModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.InputTableContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.InputTableModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.InputTableContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.InputTableModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/MealStandModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/MealStandModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.MealStandContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.MealStandModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.MealStandModel;
 
 import dagger.Binds;
 import dagger.Module;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/OrderCenterModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/OrderCenterModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderCenterContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.OrderCenterModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.OrderCenterModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/OrderContentModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/OrderContentModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderContentContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.OrderContentModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.OrderContentModel;
 
 import dagger.Binds;
 import dagger.Module;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/OrderDetailModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/OrderDetailModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderDetailContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.OrderDetailModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderDetailContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.OrderDetailModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/OrderPayModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/OrderPayModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderPayContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.OrderPayModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.OrderPayModel;
 
 import dagger.Binds;
 import dagger.Module;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/SoldoutCtrlModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/SoldoutCtrlModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.SoldoutCtrlContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.SoldoutCtrlModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.SoldoutCtrlContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.SoldoutCtrlModel;
 
 import dagger.Binds;
 import dagger.Module;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/StateTableModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/StateTableModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.StateTableContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.StateTableModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.StateTableContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.StateTableModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/module/TableModule.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/module/TableModule.java

-package com.gingersoft.gsa.cloud.bean.di.module;
+package com.gingersoft.gsa.cloud.table.di.module;
 
 import dagger.Binds;
 import dagger.Module;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.TableContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.TableModel;
+import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.TableModel;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/AllOrderContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/AllOrderContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.mvp.IView;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/AllTableContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/AllTableContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.mvp.IView;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/BaseOrderContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/BaseOrderContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.mvp.IModel;
 import com.jess.arms.mvp.IView;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/FineItemAllContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/FineItemAllContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import android.app.Activity;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/FineItemOneselfContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/FineItemOneselfContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import android.app.Activity;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/InputTableContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/InputTableContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/MealStandContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealStandContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import android.app.Activity;
 import android.widget.BaseAdapter;
@@ -11,8 +11,8 @@ import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
 import com.gingersoft.gsa.cloud.database.bean.FoodModifier;
 import com.gingersoft.gsa.cloud.database.bean.Modifier;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.FoodReason;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
 import com.jess.arms.base.DefaultAdapter;
 
 import java.util.List;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/OrderCenterContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderCenterContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.OrderDetailItem;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.AllOrderFragment;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.OrderDetailItem;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment;
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/OrderContentContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderContentContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import android.content.Intent;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.TableDetail;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.AllTableFragment;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment;
 import com.gingersoft.gsa.cloud.database.bean.Discount;
 import com.jess.arms.base.DefaultAdapter;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/OrderDetailContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderDetailContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.OrderDetailItem;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.OrderDetailItem;
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/OrderPayContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderPayContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.RefundRespose;
-import com.gingersoft.gsa.cloud.bean.app.payment.bean.SaleRespose;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.RefundRespose;
+import com.gingersoft.gsa.cloud.table.app.payment.bean.SaleRespose;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.StatusLoadingDialog;
 
 import java.util.List;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/SoldoutCtrlContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/SoldoutCtrlContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.common.bean.FoodBean;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/StateTableContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/StateTableContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.mvp.IView;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/contract/TableContract.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableContract.java

-package com.gingersoft.gsa.cloud.bean.mvp.contract;
+package com.gingersoft.gsa.cloud.table.mvp.contract;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.TableDetail;
-import com.gingersoft.gsa.cloud.bean.mvp.model.table.action.TableAction;
-import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.AllTableFragment;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
+import com.gingersoft.gsa.cloud.table.mvp.model.table.action.TableAction;
+import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.bean.Modifier;
 import com.jess.arms.base.DefaultAdapter;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/AllOrderModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/AllOrderModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.AllOrderContract;
+import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.FragmentScope;
 import com.jess.arms.integration.IRepositoryManager;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/AllTableModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/AllTableModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
@@ -10,7 +10,7 @@ import com.jess.arms.di.scope.FragmentScope;
 
 import javax.inject.Inject;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.AllTableContract;
+import com.gingersoft.gsa.cloud.table.mvp.contract.AllTableContract;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/FineItemAllModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/FineItemAllModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.FineItemAllContract;
+import com.gingersoft.gsa.cloud.table.mvp.contract.FineItemAllContract;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.FragmentScope;
 import com.jess.arms.integration.IRepositoryManager;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/FineItemOneselfModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/FineItemOneselfModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
@@ -6,7 +6,7 @@ import com.gingersoft.gsa.cloud.database.bean.ComboItem;
 import com.gingersoft.gsa.cloud.database.bean.Modifier;
 import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils;
 import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.FineItemOneselfContract;
+import com.gingersoft.gsa.cloud.table.mvp.contract.FineItemOneselfContract;
 import com.google.gson.Gson;
 import com.jess.arms.integration.IRepositoryManager;
 import com.jess.arms.mvp.BaseModel;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/InputTableModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/InputTableModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
@@ -10,7 +10,7 @@ import com.jess.arms.di.scope.FragmentScope;
 
 import javax.inject.Inject;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.InputTableContract;
+import com.gingersoft.gsa.cloud.table.mvp.contract.InputTableContract;
 
 
 /**

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/MealStandModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
@@ -13,14 +13,14 @@ import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils;
 import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils;
 import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils;
 import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.MealStandContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.FoodReason;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.MealService;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.MemberService;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.OrderPayService;
+import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.MemberService;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.integration.IRepositoryManager;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/OrderCenterModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderCenterModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.OrderService;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderService;
 import com.google.gson.Gson;
 import com.jess.arms.integration.IRepositoryManager;
 import com.jess.arms.mvp.BaseModel;
@@ -12,7 +12,7 @@ import com.jess.arms.di.scope.ActivityScope;
 
 import javax.inject.Inject;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderCenterContract;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
 
 import io.reactivex.Observable;
 import io.reactivex.functions.Function;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/OrderContentModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
@@ -7,13 +7,13 @@ import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
 import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
 import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderContentContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.TableDetail;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.MealService;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.MemberService;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.OrderPayService;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.TableService;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.MemberService;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.TableService;
 import com.gingersoft.gsa.cloud.database.bean.Discount;
 import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils;
 import com.google.gson.Gson;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/OrderDetailModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderDetailModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderDetailContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.OrderService;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderDetailContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderService;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.integration.IRepositoryManager;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/OrderPayModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderPayModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.OrderPayContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.MealService;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.OrderPayService;
+import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.integration.IRepositoryManager;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/SoldoutCtrlModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/SoldoutCtrlModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.common.bean.FoodBean;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.SoldoutCtrlContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.MealService;
+import com.gingersoft.gsa.cloud.table.mvp.contract.SoldoutCtrlContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.integration.IRepositoryManager;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/StateTableModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/StateTableModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.bean.mvp.contract.StateTableContract;
+import com.gingersoft.gsa.cloud.table.mvp.contract.StateTableContract;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.FragmentScope;
 import com.jess.arms.integration.IRepositoryManager;

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/TableModel.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java

-package com.gingersoft.gsa.cloud.bean.mvp.model;
+package com.gingersoft.gsa.cloud.table.mvp.model;
 
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
-import com.gingersoft.gsa.cloud.bean.mvp.contract.TableContract;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.BaseOrderRespose;
-import com.gingersoft.gsa.cloud.bean.mvp.model.bean.TableDetail;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.OrderService;
-import com.gingersoft.gsa.cloud.bean.mvp.model.service.TableService;
+import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderService;
+import com.gingersoft.gsa.cloud.table.mvp.model.service.TableService;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.bean.Modifier;
 import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;