361 Commits

Author SHA1 Message Date
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
xiezhijun
5de80fd57f 健康评估报告 2021-02-27 16:55:31 +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
488a149ec3 健康体征报告 2021-02-26 18:45:56 +08:00
xiezhijun
912300838a 食谱计划优化,未修改完 2021-02-25 19:05:14 +08:00
xiezhijun
204529f52e 订单相关优化 2021-02-25 17:30:51 +08:00
xiezhijun
4df7ab0665 进粉统计优化 2021-02-24 23:51:21 +08:00
huangdeliang
d90ff968af 修改 2021-02-24 18:59:18 +08:00
huangdeliang
12607455a0 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop 2021-02-24 18:22:27 +08:00
huangdeliang
31088215b5 修改样式,修改逻辑 2021-02-24 18:20:45 +08:00
xiezhijun
bd70cd6566 订单新增优化 2021-02-24 18:19:27 +08:00
xiezhijun
66957edce0 外食计算优化,异步更新热量加上延迟 2021-02-24 10:52:56 +08:00
huangdeliang
13727e8d39 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-02-24 08:55:57 +08:00
huangdeliang
62e2d22d24 修改订单,添加假删字段 2021-02-24 08:55:33 +08:00
xiezhijun
20b7697ddc 外食计算 2021-02-23 18:53:29 +08:00
xiezhijun
9de0e2bffc Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-02-23 15:36:23 +08:00
xiezhijun
c1a937adf4 外食计算优化,添加详情功能 2021-02-23 15:35:50 +08:00
huangdeliang
666cb34d2a 修复未生成食谱逻辑错误 2021-02-23 12:00:06 +08:00
huangdeliang
81ce32847a 修复错误 2021-02-22 19:59:14 +08:00
德仔
5c5709d606 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-02-22 19:49:36 +08:00
huangdeliang
3f620ed894 生成食谱接口对接 2021-02-22 19:36:01 +08:00
xiezhijun
473ccef008 外食计算器优化,营养成分以及热量比例数据计算 2021-02-22 19:30:33 +08:00