| 
							
							
								 xiezhijun | da905e1092 | 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:43:30 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | 2b571aca92 | 菜品添加、查询优化 | 2021-03-11 18:31:34 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | c166c1e29c | 1,修复复制数据问题 2,调整食谱制作界面 | 2021-03-11 16:50:13 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | fc9086103f | 1,保持字体 2,替换菜品时备注
3,修复未生成食谱时多次粘贴后删除全删 | 2021-03-10 19:10:57 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | aa555d98c2 | 采购计划开发 | 2021-03-10 17:35:19 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 7709c85cb0 | 修改食谱展示 | 2021-03-09 18:26:48 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | b3ce59ff25 | 另存为模板功能 | 2021-03-08 16:04:36 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | ff89b9bf5e | 修复食谱生成bug | 2021-03-08 11:32:27 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | f217adec10 | 增加备注信息 | 2021-03-06 18:17:25 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | d7e5ae3732 | 订单管理页面适配手机端 | 2021-03-06 11:34:15 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 17b7c04f6d | 修复修改问题 | 2021-03-05 16:30:14 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 4c654d8617 | 修改样式,添加字体修改 | 2021-03-05 15:44:45 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 4f08bedf61 | 复制功能 | 2021-03-05 14:32:47 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | bea29e310e | 新增替换功能,快速增加餐类菜品 | 2021-03-04 16:50:51 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 7e97f8510f | 修复食材分量不正确问题 | 2021-03-03 14:20:55 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 92081f7035 | 修复创建模板问题 | 2021-03-03 13:46:20 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 297a97db9e | 调整删除错误 | 2021-03-02 19:22:26 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 3d20c30edc | 食谱模板功能完成 | 2021-03-01 19:04:01 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 1d7b7cd259 | 串联功能 | 2021-02-27 16:57:45 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 02a67be4fe | !77 食谱展示界面开发 Merge pull request !77 from 德仔/develop | 2021-02-26 20:16:12 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 9e87e1c9e8 | 食谱展示界面开发 | 2021-02-26 20:14:35 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | 204529f52e | 订单相关优化 | 2021-02-25 17:30:51 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 31088215b5 | 修改样式,修改逻辑 | 2021-02-24 18:20:45 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 62e2d22d24 | 修改订单,添加假删字段 | 2021-02-24 08:55:33 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | df52ea8f2d | 新增global,缓存职位信息 | 2021-02-23 15:09:17 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 666cb34d2a | 修复未生成食谱逻辑错误 | 2021-02-23 12:00:06 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 81ce32847a | 修复错误 | 2021-02-22 19:59:14 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | de4e43af4e | 修复选项 | 2021-02-22 19:45:33 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 3f620ed894 | 生成食谱接口对接 | 2021-02-22 19:36:01 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | a7ca979d06 | 菜品增删查改对接 | 2021-02-20 19:46:13 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 854171897d | 食谱编辑交互 | 2021-02-19 19:08:08 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | e404c3be1a | 完成菜品修改 | 2021-02-18 17:05:10 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 1775b657a7 | 修复菜品修改问题 | 2021-02-09 14:10:47 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | afb7465281 | 修复通俗重量 | 2021-02-09 10:25:34 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 53bc0d22fd | 增加userId获取方法 | 2021-01-19 12:15:24 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | e6b6ff145b | 修改系统 | 2020-11-25 21:36:44 +08:00 |  |