460 Commits

Author SHA1 Message Date
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
huangdeliang
6fe95722e2 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-03-29 18:59:55 +08:00
xiezhijun
e93bce4731 进粉统计加上时间范围筛选 2021-03-29 18:40:28 +08:00
xiezhijun
b87b96d46e 提成明细优化 2021-03-28 17:38:38 +08:00
xiezhijun
b90eff14b0 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-27 19:29:28 +08:00
xiezhijun
4bee383358 提成详情 2021-03-27 19:29:15 +08:00
huangdeliang
870efe5b55 老体征信息添加备注 2021-03-27 17:24:32 +08:00
德仔
5d4f07a6e4 !179 修改合同签订页面
Merge pull request !179 from 德仔/develop
2021-03-27 11:23:22 +08:00
huangdeliang
cd22a2ca7f 修改合同签订页面 2021-03-27 11:22:20 +08:00
xiezhijun
b1d2c60f4f Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-26 19:04:57 +08:00
xiezhijun
74cfe232a8 订单按天计算详情 2021-03-26 19:04:44 +08:00
德仔
62e93e99a3 !177 修复食谱备注
Merge pull request !177 from 德仔/develop
2021-03-26 18:10:12 +08:00
huangdeliang
d75984ed3a 修复食谱备注 2021-03-26 18:09:12 +08:00
德仔
9397aa954b !176 修复同一天同一餐别菜名相同合并的情况
Merge pull request !176 from 德仔/develop
2021-03-26 16:57:14 +08:00
huangdeliang
36384820bb 修复同一天同一餐别菜名相同合并的情况 2021-03-26 16:55:55 +08:00
德仔
00a490b8af !175 食谱导出功能
Merge pull request !175 from 德仔/develop
2021-03-26 16:10:32 +08:00
huangdeliang
4ce5f3f7da 食谱导出功能 2021-03-26 16:09:27 +08:00
德仔
5f1710b927 !174 修改细节
Merge pull request !174 from 德仔/develop
2021-03-26 14:42:43 +08:00
huangdeliang
6fe2d84e5e 修改细节 2021-03-26 14:41:33 +08:00
德仔
6c0796342b !173 修复食谱采购统计问题
Merge pull request !173 from 德仔/develop
2021-03-26 14:17:12 +08:00
huangdeliang
86bb66a757 修复食谱采购统计问题 2021-03-26 14:16:08 +08:00
xiezhijun
f937285895 食谱计划生成时更新天数,食谱暂停限制范围,不能添加上月日期 2021-03-25 18:54:29 +08:00
xiezhijun
4fece27960 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-25 17:27:01 +08:00
xiezhijun
dffca92564 提成计算优化,新增提成计算开始时间 2021-03-25 17:26:47 +08:00
德仔
2a23b51612 !170 修改食材,菜品删除逻辑
Merge pull request !170 from 德仔/develop
2021-03-25 16:58:34 +08:00
huangdeliang
b4e66b2cda 修改食材,菜品删除逻辑 2021-03-25 16:42:05 +08:00
德仔
969ccdaeba !169 修复健康评估
Merge pull request !169 from 德仔/develop
2021-03-25 11:15:11 +08:00
huangdeliang
6d1fa36021 修复健康评估 2021-03-25 11:12:39 +08:00
德仔
0546388916 !168 打卡接口sql优化
Merge pull request !168 from 德仔/xzj
2021-03-24 19:04:33 +08:00