399 Commits

Author SHA1 Message Date
huangdeliang
84c851d1db 修复阿里云oss空指针 2021-03-18 11:55:44 +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
德仔
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
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
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
德仔
e445f40d1d !129 食谱制作状态
Merge pull request !129 from 德仔/develop
2021-03-13 20:01:04 +08:00
huangdeliang
3056bc2b84 修复病史数据 2021-03-13 19:25:44 +08:00
huangdeliang
51be6ba97a 食谱制作状态 2021-03-13 18:21:03 +08:00
xiezhijun
2e11a4a0ee 订单查询优化 2021-03-13 16:32:27 +08:00
xiezhijun
9d03073763 食谱计划更新 2021-03-13 15:40:34 +08:00
xiezhijun
20a30369bc Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-13 11:41:30 +08:00
xiezhijun
5de284c1d9 食谱计划优化 2021-03-13 11:41:14 +08:00
huangdeliang
ac7ae33142 删除未审核的食谱计划 2021-03-12 18:20:43 +08:00
huangdeliang
a2773a75c3 修复健康信息 2021-03-12 14:50:35 +08:00
xiezhijun
41d8df3895 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-11 18:43:55 +08:00
德仔
a2d4c579cc !119 新增1天体验
Merge pull request !119 from 德仔/develop
2021-03-11 18:39:37 +08:00
huangdeliang
c959692e9a 新增1天体验 2021-03-11 18:36:34 +08:00
xiezhijun
2b571aca92 菜品添加、查询优化 2021-03-11 18:31:34 +08:00
德仔
415e7f3859 !115 菜品加大类、小类
Merge pull request !115 from 德仔/xzj
2021-03-10 17:38:18 +08:00
德仔
6e742dfdab !114 采购计划开发
Merge pull request !114 from 德仔/develop
2021-03-10 17:37:03 +08:00
xiezhijun
989889f4cf 菜品加大类、小类 2021-03-10 17:36:10 +08:00
huangdeliang
aa555d98c2 采购计划开发 2021-03-10 17:35:19 +08:00
xiezhijun
addf0fc000 案例管理优化 2021-03-09 18:25:13 +08:00
huangdeliang
b3ce59ff25 另存为模板功能 2021-03-08 16:04:36 +08:00
huangdeliang
ff89b9bf5e 修复食谱生成bug 2021-03-08 11:32:27 +08:00
德仔
f584f29685 !103 增加备注信息
Merge pull request !103 from 德仔/develop
2021-03-06 18:24:01 +08:00
huangdeliang
f217adec10 增加备注信息 2021-03-06 18:17:25 +08:00
xiezhijun
e35992d984 案例修改、图片预览 2021-03-06 18:06:39 +08:00
德仔
9cdefdb81b !100 修复食谱展示页面
Merge pull request !100 from 德仔/develop
2021-03-06 14:19:21 +08:00
huangdeliang
d266eabe8b 修复食谱展示页面 2021-03-06 14:14:25 +08:00
xiezhijun
f1adbb041f 案例管理的文件下载 2021-03-06 00:15:27 +08:00
xiezhijun
b4d5eabf32 案例管理 2021-03-05 20:15:05 +08:00
德仔
a675d46dbd !93 修复菜品新增错误
Merge pull request !93 from 德仔/develop
2021-03-04 20:38:46 +08:00
xiezhijun
2a7c499b24 案例管理,添加修改暂停优化,判断时间不能重叠 2021-03-04 18:35:06 +08:00
huangdeliang
8e3142553b 修复菜品新增错误 2021-03-04 18:02:19 +08:00
德仔
46bd587aef !90 新增替换功能,快速增加餐类菜品
Merge pull request !90 from 德仔/develop
2021-03-04 16:52:08 +08:00
huangdeliang
bea29e310e 新增替换功能,快速增加餐类菜品 2021-03-04 16:50:51 +08:00
xiezhijun
a20ef83dc4 食谱计划优化 2021-03-03 18:17:03 +08:00
xiezhijun
4943af635f 合并主分支内容 2021-03-03 16:19:02 +08:00