488 Commits

Author SHA1 Message Date
德仔
d59ab3b69b !211 调整订单修改
Merge pull request !211 from 德仔/develop
2021-04-17 18:03:13 +08:00
huangdeliang
ef882b2154 调整订单修改 2021-04-17 18:00:45 +08:00
xiezhijun
f2d2e8c8ac 营养知识模块优化 2021-04-17 17:58:09 +08:00
德仔
ecebe84978 !209 新增营养知识功能
Merge pull request !209 from 德仔/xzj
2021-04-16 19:05:46 +08:00
xiezhijun
4c8f29a50a 新增营养知识功能 2021-04-16 19:02:42 +08:00
德仔
c0bdb0ebf2 !207 调整页面
Merge pull request !207 from 德仔/develop
2021-04-15 18:27:28 +08:00
huangdeliang
ca1a5727d5 调整页面 2021-04-15 18:26:43 +08:00
德仔
394524cbb3 !206 修复合作方bug
Merge pull request !206 from 德仔/develop
2021-04-15 16:15:57 +08:00
huangdeliang
8b21414371 修复合作方bug 2021-04-15 16:13:23 +08:00
德仔
7ae95e8d96 !205 完善客户档案
Merge pull request !205 from 德仔/develop
2021-04-15 15:35:57 +08:00
huangdeliang
fe7c44d173 完善客户档案 2021-04-15 15:34:40 +08:00
德仔
5456e97d9a !204 打卡优化
Merge pull request !204 from 德仔/xzj
2021-04-15 12:01:47 +08:00
huangdeliang
5fe3c85e1d 添加合作方功能 2021-04-15 11:59:14 +08:00
xiezhijun
699de4b458 打卡优化 2021-04-15 11:25:40 +08:00
xiezhijun
a92941b525 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-15 10:52:16 +08:00
xiezhijun
5c048db222 打卡优化 2021-04-15 09:27:16 +08:00
xiezhijun
8d8dc77642 小程序打卡功能优化 2021-04-14 17:25:40 +08:00
huangdeliang
7326c487d9 调整更换记录 2021-04-13 19:46:49 +08:00
德仔
88fcdbb3d1 !201 调整图表
Merge pull request !201 from 德仔/develop
2021-04-12 18:24:00 +08:00
huangdeliang
ab519a9257 调整图表 2021-04-12 18:22:44 +08:00
xiezhijun
5a5dbbfca2 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-10 18:10:51 +08:00
xiezhijun
78399c52e7 客户档案加上打卡记录以及体重趋势图 2021-04-10 18:10:36 +08:00
德仔
25fc8a4ed8 !198 调整食谱界面
Merge pull request !198 from 德仔/recipes_show
2021-04-10 16:22:00 +08:00
huangdeliang
b6e3d8d4bc 调整食谱界面 2021-04-10 16:20:49 +08:00
huangdeliang
f28f009086 暂存 2021-04-10 09:05:05 +08:00
xiezhijun
fe7834e640 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-09 20:00:06 +08:00
xiezhijun
1789e77786 打卡功能优化 2021-04-09 19:59:54 +08:00
huangdeliang
39ad0f1b86 食谱模板分页 2021-04-09 15:05:30 +08:00
huangdeliang
ccef6fa24c 多关键字搜索 2021-04-09 11:58:15 +08:00
huangdeliang
73d716126c 导出图片切换名字&生成模板自动已审核 2021-04-07 16:57:52 +08:00
huangdeliang
f2946fea59 修复菜谱截取功能 2021-04-06 19:13:54 +08:00
xiezhijun
45a47a29a4 订单order_id使用时间戳 2021-04-06 15:52:26 +08:00
xiezhijun
6d77e6e07c Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-03 18:38:35 +08:00
xiezhijun
d0b2cf7d3d 营养师、售后更换的提成转移,食谱计划生成优化等 2021-04-03 18:38:20 +08:00
huangdeliang
f412a4e70e 快捷功能开发完成 2021-04-02 16:33:27 +08:00
huangdeliang
2323add9bf 添加制作中 2021-04-01 19:27:39 +08:00
huangdeliang
4cf6867be0 修复健康数据问题 2021-04-01 17:25:58 +08:00
德仔
ff016069a1 !188 合同签订后跳转问题
Merge pull request !188 from 德仔/develop
2021-03-30 17:40:48 +08:00
huangdeliang
9d9cd081f5 合同签订后跳转问题 2021-03-30 17:33:18 +08:00
德仔
b8a8047b9d !187 修复食谱计划bug
Merge pull request !187 from 德仔/develop
2021-03-30 17:21:41 +08:00
huangdeliang
14a4738807 去除log 2021-03-30 17:20:49 +08:00
huangdeliang
33cf8078cc 修复食谱计划bug 2021-03-30 17:20:05 +08:00
德仔
a4d8fc3544 !186 添加食谱计划发送状态开关
Merge pull request !186 from 德仔/develop
2021-03-30 16:45:52 +08:00
huangdeliang
fa3698cf16 添加食谱计划发送状态开关 2021-03-30 16:44:50 +08:00
德仔
9c010900db !184 修复修改信息
Merge pull request !184 from 德仔/develop
2021-03-30 15:20:18 +08:00
huangdeliang
e613c44893 修复修改信息 2021-03-30 15:02:45 +08:00
德仔
49d5364022 !183 修改气血数据
Merge pull request !183 from 德仔/develop
2021-03-30 13:46:43 +08:00
huangdeliang
20466936ce 修改气血数据 2021-03-30 13:45:33 +08:00
德仔
3119fa90e2 !182 进粉统计加上时间范围筛选
Merge pull request !182 from 德仔/xzj
2021-03-29 19:44:47 +08:00
huangdeliang
8f94c50d22 处理暂停日期 2021-03-29 19:42:00 +08:00