# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	print-module/src/main/java/com/joe/print/mvp/print/Print.java
#	user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java

2、新增點擊首頁標題重選品牌餐廳

# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
#	public-base/build.gradle
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/callback/CommandImpl.java

# Conflicts:
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java

2、套餐食品沒有跟餐問題
3、食品組邊框調整

# Conflicts:
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	public-database/src/main/java/com/gingersoft/gsa/cloud/database/bean/Food.java
#	public-database/src/main/java/com/gingersoft/gsa/cloud/database/greendao/FoodDao.java
#	public-ui/build.gradle
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java

2、下單實體由food 換成 orderDetail
3、食品表新增字段

2、增加食品點選送單流程

# Conflicts:
#	user/component-login/src/main/AndroidManifest.xml
#	user/component-login/src/main/java/com/gingersoft/gsa/cloud/user/login/LoginActivity.java
#	user/component-login/src/main/res/layout/user_login_activity.xml