| 
							
							
								 德仔 | 8f1c94a3af | !144 备注信息可换行 Merge pull request !144 from 德仔/develop | 2021-03-18 14:32:13 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 4fc71f9ac0 | 备注信息可换行 | 2021-03-18 14:31:04 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | b6cd58c553 | !143 修复上传图片功能 Merge pull request !143 from 德仔/develop | 2021-03-18 14:02:40 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 683593ba16 | 修复上传图片功能 | 2021-03-18 14:02:12 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 86aa3e4898 | !142 减脂指导修改界面优化 Merge pull request !142 from 德仔/xzj | 2021-03-18 11:57:15 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 8b3ae9c299 | !141 修复阿里云oss空指针 Merge pull request !141 from 德仔/develop | 2021-03-18 11:56:29 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 84c851d1db | 修复阿里云oss空指针 | 2021-03-18 11:55:44 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | 75d11bb9e3 | Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj | 2021-03-17 18:37:00 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | b78a68c807 | 减脂指导修改界面优化 | 2021-03-17 18:36:46 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 65b6505ef0 | !140 修复tooltip Merge pull request !140 from 德仔/develop | 2021-03-17 17:45:34 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | f4521ec9dd | 修复tooltip | 2021-03-17 17:44:42 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 5d38073bcc | !139 添加热量分析图表 Merge pull request !139 from 德仔/develop | 2021-03-17 17:26:00 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 9d9701f235 | 调整 | 2021-03-17 17:24:49 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | b36cef2948 | 添加热量分析图表 | 2021-03-17 17:17:09 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 0e710feb33 | !138 修复oss图片预览 Merge pull request !138 from 德仔/develop | 2021-03-17 14:40:50 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | ba372bee26 | 修复oss图片预览 | 2021-03-17 14:39:46 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | d1c1d2e539 | !137 完成食材图片上传 Merge pull request !137 from 德仔/develop | 2021-03-17 14:18:20 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 917f2ab975 | 完成食材图片上传 | 2021-03-17 14:15:33 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 5ec05d913b | !136 页面食谱修复备注信息 Merge pull request !136 from 德仔/develop | 2021-03-17 14:01:59 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 64d232d2d6 | 页面食谱修复备注信息 | 2021-03-17 13:58:05 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | d903f64c7a | !135 修复表名称 Merge pull request !135 from 德仔/develop | 2021-03-17 13:46:54 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 8124005e7e | 修复表名称 | 2021-03-17 13:45:54 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 1445450f53 | !134 体检报告下载优化 Merge pull request !134 from 德仔/xzj | 2021-03-16 20:12:04 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | b037802a9c | !133 食材添加信息 Merge pull request !133 from 德仔/develop | 2021-03-16 20:10:50 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 1b5a4f3777 | 食材添加信息 | 2021-03-16 20:09:28 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | ca9cafc4c7 | Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj | 2021-03-16 18:40:24 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | 85050259c9 | 体检报告下载优化 | 2021-03-16 18:40:09 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | b65f9534e1 | Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj | 2021-03-16 17:56:45 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 03eb2508b6 | 食材添加信息 | 2021-03-16 17:53:17 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 7a3ab6bfef | 客户档案调整 | 2021-03-16 15:05:53 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 02c085b2e6 | !132 工资比例计算 Merge pull request !132 from 德仔/xzj | 2021-03-15 20:59:02 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | f461c32c52 | Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop | 2021-03-15 20:55:55 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | f02235936c | 完成忌口检查 | 2021-03-15 20:53:32 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | 579a8b31ab | Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj | 2021-03-15 18:02:20 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | 0f03406d4c | 工资比例计算 | 2021-03-15 18:01:59 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | c88a57a029 | !131 调整 Merge pull request !131 from 德仔/develop | 2021-03-15 14:12:12 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 5167828ff8 | 调整 | 2021-03-15 14:11:22 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | ae982051aa | !130 修复另存为 Merge pull request !130 from 德仔/develop | 2021-03-15 11:39:35 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 8155373958 | 修复另存为 | 2021-03-15 11:38:09 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | e445f40d1d | !129 食谱制作状态 Merge pull request !129 from 德仔/develop | 2021-03-13 20:01:04 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 79a1c4c554 | 修复健康信息 | 2021-03-13 20:00:18 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 3056bc2b84 | 修复病史数据 | 2021-03-13 19:25:44 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | cac31face0 | 修复保存后url | 2021-03-13 18:30:07 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 51be6ba97a | 食谱制作状态 | 2021-03-13 18:21:03 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | a3b07ae8a0 | !127 食谱计划优化 Merge pull request !127 from 德仔/xzj | 2021-03-13 17:16:58 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | 2e11a4a0ee | 订单查询优化 | 2021-03-13 16:32:27 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | 9d03073763 | 食谱计划更新 | 2021-03-13 15:40:34 +08:00 |  | 
			
				
					| 
							
							
								 xiezhijun | c4cb3e2180 | Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj | 2021-03-13 12:31:09 +08:00 |  | 
			
				
					| 
							
							
								 德仔 | 6fc379613f | !128 放开调整时间 Merge pull request !128 from 德仔/develop | 2021-03-13 11:53:48 +08:00 |  | 
			
				
					| 
							
							
								 huangdeliang | 0f201eb2fd | 放开调整时间 | 2021-03-13 11:52:56 +08:00 |  |