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 |
|
xiezhijun
|
8345aa2991
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-04-01 18:45:56 +08:00 |
|
xiezhijun
|
5d95de3a2a
|
食谱计划生成修改，根据客户ID重新生成，暂停记录不需要加订单ID
|
2021-04-01 18:45:41 +08:00 |
|
德仔
|
b8a8047b9d
|
!187 修复食谱计划bug
Merge pull request !187 from 德仔/develop
|
2021-03-30 17:21:41 +08:00 |
|
huangdeliang
|
f7b0805335
|
修复食谱计划bug
|
2021-03-30 17:20:15 +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 |
|
xiezhijun
|
8b07969264
|
订单导出修改，增加进粉时间
|
2021-03-30 15:29:24 +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
|
4bee383358
|
提成详情
|
2021-03-27 19:29:15 +08:00 |
|
huangdeliang
|
870efe5b55
|
老体征信息添加备注
|
2021-03-27 17:24:32 +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 |
|
德仔
|
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
|
56bcd16126
|
加上定金单不生成食谱
|
2021-03-25 17:40:46 +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 |
|
xiezhijun
|
63ab5bdc85
|
打卡接口sql优化
|
2021-03-24 18:36:31 +08:00 |
|
xiezhijun
|
23015d814c
|
健康报告下载名称修改，打卡相关接口优化
|
2021-03-24 17:16:36 +08:00 |
|
德仔
|
ec0b426ceb
|
!163 新增忌口编写功能
Merge pull request !163 from 德仔/develop
|
2021-03-23 20:11:26 +08:00 |
|
huangdeliang
|
2ea3d01d6e
|
新增忌口编写功能
|
2021-03-23 20:10:29 +08:00 |
|
xiezhijun
|
0ab35ed6c7
|
打卡后台，小程序接口
|
2021-03-23 18:46:10 +08:00 |
|
xiezhijun
|
7952bdb03e
|
微信打卡接口优化
|
2021-03-23 11:34:17 +08:00 |
|
xiezhijun
|
23bdf241e4
|
还原打卡记录SQL
|
2021-03-22 19:15:12 +08:00 |
|
xiezhijun
|
1d66f7334a
|
微信小程序打卡接口
|
2021-03-22 15:51:55 +08:00 |
|
xiezhijun
|
8c3eb7ab9c
|
客户案例修改
|
2021-03-19 16:02:12 +08:00 |
|
xiezhijun
|
88f6b8e955
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-18 18:48:49 +08:00 |
|
xiezhijun
|
9cc0ad82cd
|
去除食谱生成的时间限制，小程序获取案例接口
|
2021-03-18 18:48:28 +08:00 |
|
德仔
|
e26a542987
|
!145 适配中文文件
Merge pull request !145 from 德仔/develop
|
2021-03-18 16:47:30 +08:00 |
|
huangdeliang
|
a10b8715ce
|
适配中文文件
|
2021-03-18 16:45:24 +08:00 |
|
xiezhijun
|
f58668f01c
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-18 16:12:08 +08:00 |
|
xiezhijun
|
4247860f69
|
微信小程序查询案例
|
2021-03-18 16:11:54 +08:00 |
|
德仔
|
8b3ae9c299
|
!141 修复阿里云oss空指针
Merge pull request !141 from 德仔/develop
|
2021-03-18 11:56:29 +08:00 |
|
huangdeliang
|
84c851d1db
|
修复阿里云oss空指针
|
2021-03-18 11:55:44 +08:00 |
|
德仔
|
0e710feb33
|
!138 修复oss图片预览
Merge pull request !138 from 德仔/develop
|
2021-03-17 14:40:50 +08:00 |
|
huangdeliang
|
ba372bee26
|
修复oss图片预览
|
2021-03-17 14:39:46 +08:00 |
|
德仔
|
d1c1d2e539
|
!137 完成食材图片上传
Merge pull request !137 from 德仔/develop
|
2021-03-17 14:18:20 +08:00 |
|
huangdeliang
|
917f2ab975
|
完成食材图片上传
|
2021-03-17 14:15:33 +08:00 |
|
德仔
|
d903f64c7a
|
!135 修复表名称
Merge pull request !135 from 德仔/develop
|
2021-03-17 13:46:54 +08:00 |
|
huangdeliang
|
8124005e7e
|
修复表名称
|
2021-03-17 13:45:54 +08:00 |
|