# Conflicts: # base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java # base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantExpandInfoUtils.java # base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/ColorBeanDao.java # base-module/src/main/java/com/gingersoft/gsa/cloud/table/RiceponAddOrderBean.java # print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java # table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
