合并代码，解决冲突

7 months ago · 5e827ef678
1 changed files with 4 additions and 0 deletions
--- a/src/store/modules/consumables.ts
+++ b/src/store/modules/consumables.ts
@ -69,6 +69,10 @@ export const useConsumablesStore = defineStore(
      setConsumablesData,
      updateReactionPlateNum,
      updateTipNum,
      // updateWasteStatus,
      // wasteStatus,
      hasAllConsumables,
    }
  },
  // {