144 Commits

Author SHA1 Message Date
xiezhijun
97deafb62d 食谱计划生成优化 2021-03-03 16:07:52 +08:00
xiezhijun
29d5818874 订单相关优化、健康评估报告模板修改 2021-03-02 17:39:25 +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
huangdeliang
a7ca979d06 菜品增删查改对接 2021-02-20 19:46:13 +08:00
xiezhijun
3f3fcda862 外食计算器功能优化修改 2021-02-20 19:38:17 +08:00
xiezhijun
20371f9469 外食计算器 2021-02-19 19:14:26 +08:00
xiezhijun
3c42485f52 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-02-19 09:33:00 +08:00
huangdeliang
5f4b1ec33f Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-02-09 14:17:37 +08:00
huangdeliang
1775b657a7 修复菜品修改问题 2021-02-09 14:10:47 +08:00
德仔
ab630fd612 !60 修复通俗重量
Merge pull request !60 from 德仔/develop
2021-02-09 10:27:08 +08:00
huangdeliang
afb7465281 修复通俗重量 2021-02-09 10:25:34 +08:00
xiezhijun
9a2e9bde62 订单类型改版 2021-02-06 18:34:57 +08:00
德仔
615286a1ae Merge branch 'master' of gitee.com:darlk/ShengTangManage into xzj 2021-02-04 21:16:35 +08:00
xiezhijun
0283eb0a1d 微信导粉统计 2021-02-04 20:12:46 +08:00
huangdeliang
8effa650d8 Merge branch 'develop' of gitee.com:darlk/ShengTangManage into develop 2021-02-03 17:28:57 +08:00
huangdeliang
a9cde613d9 修改通俗计量方式 2021-02-03 17:28:45 +08:00
xiezhijun
b89225bc6a 客户健康信息修改 2021-02-02 20:29:53 +08:00
xiezhijun
e3d8a9fa12 客户档案的合同添加、复制健康调查链接 2021-02-01 19:13:41 +08:00
huangdeliang
973606f319 图片上传 2021-02-01 16:11:13 +08:00
huangdeliang
9c8d3bffd4 图片上传 2021-02-01 16:05:23 +08:00