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

# Conflicts:
#	stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue

stdiet-ui/src/store/modules/recipes.js

@@ -63,6 +63,7 @@ const mutations = {
           payload.cusWeight && (tarIgd.cusWeight = payload.cusWeight);
           payload.cusUnit && (tarIgd.cusUnit = payload.cusUnit);
         }
+        console.log(JSON.parse(JSON.stringify(state.recipesData)));
       } else if (actionType === "delIgd") {
         tarDishes.igdList = tarDishes.igdList.filter(
           igd => igd.id !== payload.igdId