# 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
