Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj

# Conflicts: # stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
2021-03-11 18:44:51 +08:00 · 2021-03-11 18:44:51 +08:00 · cd7e18cc0b
commit cd7e18cc0b
parent 41d8df3895
1 changed files with 1 additions and 1 deletions
--- 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>