Merge remote-tracking branch 'origin/dev' into dev

22421977 · Wyh · 7f36f6c7 · c93e73d8 · 22421977 · 22421977
Commit 22421977 authored Apr 30, 2021 by Wyh
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

ajcore.20210430.165836.758.txt
+0 -0

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
+1 -1

No files found.
--- a/ajcore.20210430.165836.758.txt
+++ b/ajcore.20210430.165836.758.txt
--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
@@ -433,7 +433,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> 
        // 使用原生的 Adapter 即可
 //        mFoodGroupAdapter = new FoodGroupAdapter(this, foodGroupList, 1);

-        mFoodGroupAdapter.setFoodGroupList(mFoodGroupList);
+//        mFoodGroupAdapter.setFoodGroupList(mFoodGroupList);
        rv_food_group.setAdapter(mFoodGroupAdapter);
        mFoodGroupAdapter.setOnItemClickListener(new FoodGroupAdapter.OnItemClickListener() {
            @Override