# Conflicts: # base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java # base-module/src/main/java/com/gingersoft/gsa/cloud/common/config/expandconfig/FunctionExtendedConfiguration.java # base-module/src/main/java/com/gingersoft/gsa/cloud/common/service/GetInfoUpdateService.kt # base-module/src/main/java/com/gingersoft/gsa/cloud/common/ui/adapter/multi/InfoMultiAdapter.java # base-module/src/main/java/com/gingersoft/gsa/cloud/common/ui/adapter/multi/InputProvider.java # base-module/src/main/java/com/gingersoft/gsa/cloud/common/utils/glide/GlideUtils.java # base-module/src/main/java/com/gingersoft/gsa/cloud/common/utils/inputFilter/InputFilterUtils.java # base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyRetrofitConfiguration.java # base-module/src/main/res/layout/print_kitchen.xml # delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/service/GetInfoUpdateService.kt # login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/ChooseRestaurantActivity.java # print-module/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java # print-module/src/main/java/com/joe/print/mvp/print/PrintSlip.java # supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/contract/NewSupplierContract.java # supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewSupplierPresenter.java # supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/server/SupplierServer.java # supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewFoodUnitFragment.java # supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewSupplierFragment.java
