# Conflicts:
#	component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java

 Conflicts:
	library-common/build.gradle

# Conflicts:
#	component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java

2、供應鏈驗收代碼

This reverts commit 8fbea4e5

# Conflicts:
#	component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java
#	component-print/src/main/java/com/joe/print/mvp/ui/view/KitChenPrjFoodView.java

2、prj沒有食品時不需要打印

2、供應鏈代碼

2、外送代碼優化
3、prj打印頁數問題處理
4、供應鏈代碼提交

# Conflicts:
#	component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderCenterActivity.java
#	component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterAdapter.java
#	component-table/src/main/res/layout/item_order_center.xml
#	config.gradle
#	library-database/src/main/java/com/gingersoft/gsa/cloud/database/utils/FoodDaoUtils.java

2、修改RestaurantInfoManager類名

# Conflicts:
#	component-login/src/main/AndroidManifest.xml
#	component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	library-order/src/main/java/com/gingersoft/gsa/cloud/order/order/DoshokuOrder.java

2、Kotlin version 為1.4.21