huangdeliang
|
4dd7a6f643
|
Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop
|
2021-03-01 19:04:14 +08:00 |
|
huangdeliang
|
3d20c30edc
|
食谱模板功能完成
|
2021-03-01 19:04:01 +08:00 |
|
xiezhijun
|
f92e07f1ed
|
订单优化、提成分为审核、未审核
|
2021-03-01 19:00:01 +08:00 |
|
德仔
|
7539ec6b7f
|
!80 串联功能
Merge pull request !80 from 德仔/develop
|
2021-02-27 20:19:20 +08:00 |
|
huangdeliang
|
2d2e68ae10
|
Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop
|
2021-02-27 20:17:36 +08:00 |
|
huangdeliang
|
77d5d346b1
|
添加食谱模板
|
2021-02-27 20:15:40 +08:00 |
|
xiezhijun
|
2ceefcf9a5
|
食谱计划修改
|
2021-02-27 19:22:25 +08:00 |
|
xiezhijun
|
a244a4a536
|
Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-02-27 16:58:41 +08:00 |
|
huangdeliang
|
1d7b7cd259
|
串联功能
|
2021-02-27 16:57:45 +08:00 |
|
xiezhijun
|
a1cb4861ea
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-02-27 16:55:46 +08:00 |
|
xiezhijun
|
5de80fd57f
|
健康评估报告
|
2021-02-27 16:55:31 +08:00 |
|
德仔
|
df485e55d0
|
!79 解决接口权限
Merge pull request !79 from 德仔/develop
|
2021-02-26 20:46:29 +08:00 |
|
huangdeliang
|
d803e13ca3
|
解决接口权限
|
2021-02-26 20:45:30 +08:00 |
|
德仔
|
227c15ba8d
|
!78 修改接口token
Merge pull request !78 from 德仔/develop
|
2021-02-26 20:28:59 +08:00 |
|
huangdeliang
|
faa1df53e1
|
修改接口token
|
2021-02-26 20:27:38 +08:00 |
|
德仔
|
02a67be4fe
|
!77 食谱展示界面开发
Merge pull request !77 from 德仔/develop
|
2021-02-26 20:16:12 +08:00 |
|
huangdeliang
|
9e87e1c9e8
|
食谱展示界面开发
|
2021-02-26 20:14:35 +08:00 |
|
xiezhijun
|
488a149ec3
|
健康体征报告
|
2021-02-26 18:45:56 +08:00 |
|
xiezhijun
|
763493bec3
|
Merge branch 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-02-25 20:22:48 +08:00 |
|
xiezhijun
|
912300838a
|
食谱计划优化，未修改完
|
2021-02-25 19:05:14 +08:00 |
|
德仔
|
2de4e1e845
|
!76 订单相关优化
Merge pull request !76 from 德仔/xzj
|
2021-02-25 17:43:27 +08:00 |
|
xiezhijun
|
204529f52e
|
订单相关优化
|
2021-02-25 17:30:51 +08:00 |
|
德仔
|
2724f5803f
|
!75 用户管理
Merge pull request !75 from 德仔/develop
|
2021-02-25 09:15:04 +08:00 |
|
huangdeliang
|
e352e2f8aa
|
用户管理
|
2021-02-25 09:13:48 +08:00 |
|
德仔
|
a793e1dbee
|
!74 进粉统计优化
Merge pull request !74 from 德仔/xzj
|
2021-02-25 09:02:30 +08:00 |
|
xiezhijun
|
4df7ab0665
|
进粉统计优化
|
2021-02-24 23:51:21 +08:00 |
|
德仔
|
fe20d020b1
|
!73 修改
Merge pull request !73 from 德仔/develop
|
2021-02-24 19:00:42 +08:00 |
|
huangdeliang
|
d90ff968af
|
修改
|
2021-02-24 18:59:18 +08:00 |
|
德仔
|
ad8ac9aa43
|
!72 订单系统修改
Merge pull request !72 from 德仔/develop
|
2021-02-24 18:56:34 +08:00 |
|
huangdeliang
|
12607455a0
|
Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop
|
2021-02-24 18:22:27 +08:00 |
|
huangdeliang
|
31088215b5
|
修改样式，修改逻辑
|
2021-02-24 18:20:45 +08:00 |
|
xiezhijun
|
bd70cd6566
|
订单新增优化
|
2021-02-24 18:19:27 +08:00 |
|
xiezhijun
|
66957edce0
|
外食计算优化，异步更新热量加上延迟
|
2021-02-24 10:52:56 +08:00 |
|
huangdeliang
|
13727e8d39
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop
|
2021-02-24 08:55:57 +08:00 |
|
huangdeliang
|
62e2d22d24
|
修改订单，添加假删字段
|
2021-02-24 08:55:33 +08:00 |
|
德仔
|
c3910b627f
|
!71 外食计算
Merge pull request !71 from 德仔/xzj
|
2021-02-24 08:53:22 +08:00 |
|
xiezhijun
|
20b7697ddc
|
外食计算
|
2021-02-23 18:53:29 +08:00 |
|
xiezhijun
|
9de0e2bffc
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-02-23 15:36:23 +08:00 |
|
xiezhijun
|
c1a937adf4
|
外食计算优化，添加详情功能
|
2021-02-23 15:35:50 +08:00 |
|
德仔
|
f36279876d
|
!70 新增global，缓存职位信息
Merge pull request !70 from 德仔/develop
|
2021-02-23 15:11:37 +08:00 |
|
huangdeliang
|
df52ea8f2d
|
新增global，缓存职位信息
|
2021-02-23 15:09:17 +08:00 |
|
德仔
|
66f3dea2b4
|
!69 紧急修复
Merge pull request !69 from 德仔/develop
|
2021-02-23 13:39:12 +08:00 |
|
huangdeliang
|
6b50ddcfdd
|
紧急修复
|
2021-02-23 13:38:07 +08:00 |
|
德仔
|
740cbc4d5c
|
!68 修复未生成食谱逻辑错误
Merge pull request !68 from 德仔/develop
|
2021-02-23 13:34:58 +08:00 |
|
huangdeliang
|
666cb34d2a
|
修复未生成食谱逻辑错误
|
2021-02-23 12:00:06 +08:00 |
|
德仔
|
60116b6eae
|
!67 修复错误
Merge pull request !67 from 德仔/develop
|
2021-02-22 20:00:13 +08:00 |
|
huangdeliang
|
81ce32847a
|
修复错误
|
2021-02-22 19:59:14 +08:00 |
|
德仔
|
f825e527bb
|
!66 食谱制作出版
Merge pull request !66 from 德仔/develop
|
2021-02-22 19:49:53 +08:00 |
|
德仔
|
5c5709d606
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop
|
2021-02-22 19:49:36 +08:00 |
|
德仔
|
7b9d38f1ca
|
!65 外食计算器优化，营养成分以及热量比例数据计算
Merge pull request !65 from 德仔/xzj
|
2021-02-22 19:47:06 +08:00 |
|