1041 Commits

Author SHA1 Message Date
德仔
3e640f6eb8 营养知识模块优化
Merge pull request  from 德仔/xzj
2021-04-17 18:13:49 +08:00
德仔
d59ab3b69b 调整订单修改
Merge pull request  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 新增营养知识功能
Merge pull request  from 德仔/xzj
2021-04-16 19:05:46 +08:00
xiezhijun
4c8f29a50a 新增营养知识功能 2021-04-16 19:02:42 +08:00
德仔
437ad87adc 查询上一个订单最后一天食谱计划改为成交时间排序
Merge pull request  from 德仔/xzj
2021-04-15 18:28:11 +08:00
德仔
c0bdb0ebf2 调整页面
Merge pull request  from 德仔/develop
2021-04-15 18:27:28 +08:00
huangdeliang
ca1a5727d5 调整页面 2021-04-15 18:26:43 +08:00
xiezhijun
15e9561327 查询上一个订单最后一天食谱计划改为成交时间排序 2021-04-15 18:24:32 +08:00
xiezhijun
47ab6b1229 修改重新生成索引接口 2021-04-15 16:29:49 +08:00
德仔
394524cbb3 修复合作方bug
Merge pull request  from 德仔/develop
2021-04-15 16:15:57 +08:00
xiezhijun
560fb3d992 知识问答接口 2021-04-15 16:15:40 +08:00
huangdeliang
8b21414371 修复合作方bug 2021-04-15 16:13:23 +08:00
德仔
7ae95e8d96 完善客户档案
Merge pull request  from 德仔/develop
2021-04-15 15:35:57 +08:00
huangdeliang
fe7c44d173 完善客户档案 2021-04-15 15:34:40 +08:00
德仔
5456e97d9a 打卡优化
Merge pull request  from 德仔/xzj
2021-04-15 12:01:47 +08:00
德仔
ff1b393bab 添加合作方功能
Merge pull request  from 德仔/develop
2021-04-15 12:00:48 +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
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
德仔
cc7e70b18a 调整更换记录
Merge pull request  from 德仔/develop
2021-04-13 19:48:18 +08:00
huangdeliang
7326c487d9 调整更换记录 2021-04-13 19:46:49 +08:00
xiezhijun
de5ca49409 知识问答相关 2021-04-13 18:58:40 +08:00
德仔
88fcdbb3d1 调整图表
Merge pull request  from 德仔/develop
2021-04-12 18:24:00 +08:00
huangdeliang
ab519a9257 调整图表 2021-04-12 18:22:44 +08:00
德仔
450ec6363b 浏览文件服务到期时间使用新算法计算,直接加天数
Merge pull request  from 德仔/xzj
2021-04-12 18:21:21 +08:00
xiezhijun
40f773f8b6 服务到期时间使用新算法计算,直接加天数 2021-04-12 18:15:08 +08:00
德仔
4e78490fc7 客户档案加上打卡记录以及体重趋势图
Merge pull request  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 调整食谱界面
Merge pull request  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 食谱模板分页
Merge pull request  from 德仔/develop
2021-04-09 15:10:45 +08:00
huangdeliang
39ad0f1b86 食谱模板分页 2021-04-09 15:05:30 +08:00
德仔
9d69ef4726 多关键字搜索
Merge pull request  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 导出图片切换名字&生成模板自动已审核
Merge pull request  from 德仔/develop
2021-04-07 18:23:00 +08:00