xiezhijun
|
40f773f8b6
|
服务到期时间使用新算法计算，直接加天数
|
2021-04-12 18:15:08 +08:00 |
|
德仔
|
4e78490fc7
|
!199 客户档案加上打卡记录以及体重趋势图
Merge pull request !199 from 德仔/xzj
|
2021-04-12 09:05:50 +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 |
|
德仔
|
d922d829c3
|
!197 食谱模板分页
Merge pull request !197 from 德仔/develop
|
2021-04-09 15:10:45 +08:00 |
|
huangdeliang
|
39ad0f1b86
|
食谱模板分页
|
2021-04-09 15:05:30 +08:00 |
|
德仔
|
9d69ef4726
|
!196 多关键字搜索
Merge pull request !196 from 德仔/develop
|
2021-04-09 11:59:19 +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 |
|
德仔
|
153c0c1b2a
|
!195 导出图片切换名字&生成模板自动已审核
Merge pull request !195 from 德仔/develop
|
2021-04-07 18:23:00 +08:00 |
|
huangdeliang
|
73d716126c
|
导出图片切换名字&生成模板自动已审核
|
2021-04-07 16:57:52 +08:00 |
|
德仔
|
25b5fcba49
|
!194 修复菜谱截取功能
Merge pull request !194 from 德仔/develop
|
2021-04-06 19:16:10 +08:00 |
|
huangdeliang
|
f2946fea59
|
修复菜谱截取功能
|
2021-04-06 19:13:54 +08:00 |
|
德仔
|
13f25e4f02
|
!193 订单order_id使用时间戳
Merge pull request !193 from 德仔/xzj
|
2021-04-06 16:01:31 +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 |
|
德仔
|
441da1f7cb
|
!192 快捷功能开发完成
Merge pull request !192 from 德仔/develop
|
2021-04-02 16:36:42 +08:00 |
|
huangdeliang
|
f412a4e70e
|
快捷功能开发完成
|
2021-04-02 16:33:27 +08:00 |
|
德仔
|
49f80af8a6
|
!191 食谱计划生成修改，根据客户ID重新生成，暂停记录不需要加订单ID
Merge pull request !191 from 德仔/xzj
|
2021-04-01 19:33:06 +08:00 |
|
德仔
|
0df3eb6b77
|
!190 添加制作中
Merge pull request !190 from 德仔/develop
|
2021-04-01 19:30:09 +08:00 |
|
huangdeliang
|
2323add9bf
|
添加制作中
|
2021-04-01 19:27:39 +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 |
|
德仔
|
81f6f836f5
|
!189 修复健康数据问题
Merge pull request !189 from 德仔/develop
|
2021-04-01 17:42:56 +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
|
f7b0805335
|
修复食谱计划bug
|
2021-03-30 17:20:15 +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 |
|
德仔
|
7010eb30bd
|
!185 订单导出修改，增加进粉时间
Merge pull request !185 from 德仔/xzj
|
2021-03-30 15:42:47 +08:00 |
|
xiezhijun
|
e8b0ae2cd7
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-30 15:29:37 +08:00 |
|
xiezhijun
|
8b07969264
|
订单导出修改，增加进粉时间
|
2021-03-30 15:29:24 +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 |
|