Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
# Conflicts: # stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
This commit is contained in:
parent
41d8df3895
commit
cd7e18cc0b
@ -71,7 +71,7 @@
|
|||||||
size="mini"
|
size="mini"
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="handleOnSave"
|
@click="handleOnSave"
|
||||||
>生成食谱2</el-button
|
>生成食谱</el-button
|
||||||
>
|
>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user