# 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
