383 Commits

Author SHA1 Message Date
德仔
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
xiezhijun
97deafb62d 食谱计划生成优化 2021-03-03 16:07:52 +08:00
德仔
dc7102f6bb !85 订单相关优化、健康评估报告模板修改
Merge pull request !85 from 德仔/xzj
2021-03-03 13:59:43 +08:00
huangdeliang
92081f7035 修复创建模板问题 2021-03-03 13:46:20 +08:00
huangdeliang
14f7113765 修复暂停计划 2021-03-02 18:56:31 +08:00
huangdeliang
0f47bb8bc9 添加暂停计划 2021-03-02 18:56:19 +08:00
xiezhijun
29d5818874 订单相关优化、健康评估报告模板修改 2021-03-02 17:39:25 +08:00
huangdeliang
ecbc4705a2 调整权限标识 2021-03-02 15:33:53 +08:00
huangdeliang
4dd7a6f643 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop 2021-03-01 19:04:14 +08:00
huangdeliang
3d20c30edc 食谱模板功能完成 2021-03-01 19:04:01 +08:00
xiezhijun
f92e07f1ed 订单优化、提成分为审核、未审核 2021-03-01 19:00:01 +08:00
huangdeliang
2d2e68ae10 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop 2021-02-27 20:17:36 +08:00
huangdeliang
77d5d346b1 添加食谱模板 2021-02-27 20:15:40 +08:00
xiezhijun
2ceefcf9a5 食谱计划修改 2021-02-27 19:22:25 +08:00
xiezhijun
a244a4a536 Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj 2021-02-27 16:58:41 +08:00
huangdeliang
1d7b7cd259 串联功能 2021-02-27 16:57:45 +08:00
xiezhijun
a1cb4861ea Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-02-27 16:55:46 +08:00