From cd7e18cc0bf84317e106d40ffa312baebaced8db Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Thu, 11 Mar 2021 18:44:51 +0800
Subject: [PATCH] Merge branches 'master' and 'xzj' of
 https://gitee.com/darlk/ShengTangManage into xzj

# Conflicts:
#	stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
---
 .../custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
index a027a0236..1e54da651 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
@@ -71,7 +71,7 @@
             size="mini"
             type="primary"
             @click="handleOnSave"
-            >生成食谱2</el-button
+            >生成食谱</el-button
           >
         </span>
       </div>