466 Commits

Author SHA1 Message Date
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
a92941b525 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-15 10:52:16 +08:00
xiezhijun
5cfbca9be0 打卡SQL优化 2021-04-15 10:32:51 +08:00
xiezhijun
90b8101280 打卡查询增加id 2021-04-15 10:25:19 +08:00
xiezhijun
3b644ee3c1 打卡优化 2021-04-15 09:32:36 +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
xiezhijun
de5ca49409 知识问答相关 2021-04-13 18:58:40 +08:00
xiezhijun
40f773f8b6 服务到期时间使用新算法计算,直接加天数 2021-04-12 18:15:08 +08:00
xiezhijun
78399c52e7 客户档案加上打卡记录以及体重趋势图 2021-04-10 18:10:36 +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
ccef6fa24c 多关键字搜索 2021-04-09 11:58:15 +08:00
xiezhijun
329a7029b0 修改打卡实体类 2021-04-08 15:26:09 +08:00
xiezhijun
27fec86dc5 编译报错 2021-04-08 14:46:13 +08:00
xiezhijun
070f36dd7c Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-08 14:43:10 +08:00
xiezhijun
164c975c93 小程序打卡 2021-04-08 14:42:53 +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
ba10d518de 提成转移算法优化 2021-04-06 13:47:51 +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
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