# Conflicts:
#	arms/build.gradle
#	base-module/build.gradle
#	base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/ExpandInfoSetting.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/UIStyleExtendedConfiguration.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DiscountDao.java
#	config.gradle
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/SendOrderActivity.java
#	order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/OrderDiscount.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
#	print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintTestActivity.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/cart/ShoppingCart.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/NomalDiscount.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java