# Conflicts: # base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java # base-module/src/main/java/com/gingersoft/gsa/cloud/ui/recylcler/event/RecyItemTouchHelperCallback.java # config.gradle # main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/service/MainService.java # main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java # main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java # main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/BusinessReportFragment.java # manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/model/bean/request/TableRequest.java # manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java # manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/TableListFragment.java # other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/CancelReason.kt # other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt # other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OtherOrderActivity.kt # other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/DeliveryFragment.kt # other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/HistoryFragment.kt # other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt # other_order_mode/src/main/res/layout/fragment_delivery_list.xml # other_order_mode/src/main/res/layout/item_delivery_layout.xml # other_order_mode/src/main/res/values/styles.xml # print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java # print-module/src/main/java/com/joe/print/mvp/print/TestPrintDataMaker.java # print-module/src/main/java/com/joe/print/mvp/ui/activity/IpPrintActivity.java # table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java # table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
