Merge branch 'develop'

2018-09-06 18:04:13 +08:00
parent 16d6afce5b 2a98c39fbd
commit 6a59c73bba
2 changed files with 29 additions and 12 deletions
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
@@ -9,6 +9,7 @@ import com.orhanobut.logger.Logger;

 public class RecommendFood implements MultiItemEntity {

+    //三种view
    public static final int TYPE_BIG = 0;
    public static final int TYPE_MIDDLE = 1;
    public static final int TYPE_DETAIL = 2;