xiezhijun
|
4943af635f
|
合并主分支内容
|
2021-03-03 16:19:02 +08:00 |
|
huangdeliang
|
333f930b8c
|
添加回车功能
|
2021-03-03 14:36:21 +08:00 |
|
huangdeliang
|
7e97f8510f
|
修复食材分量不正确问题
|
2021-03-03 14:20:55 +08:00 |
|
huangdeliang
|
92081f7035
|
修复创建模板问题
|
2021-03-03 13:46:20 +08:00 |
|
huangdeliang
|
297a97db9e
|
调整删除错误
|
2021-03-02 19:22:26 +08:00 |
|
huangdeliang
|
ecbc4705a2
|
调整权限标识
|
2021-03-02 15:33:53 +08:00 |
|
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 |
|
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
|
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 |
|
德仔
|
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 |
|
huangdeliang
|
e352e2f8aa
|
用户管理
|
2021-02-25 09:13:48 +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 |
|
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 |
|
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 |
|
huangdeliang
|
df52ea8f2d
|
新增global，缓存职位信息
|
2021-02-23 15:09:17 +08:00 |
|
huangdeliang
|
6b50ddcfdd
|
紧急修复
|
2021-02-23 13:38:07 +08:00 |
|
huangdeliang
|
666cb34d2a
|
修复未生成食谱逻辑错误
|
2021-02-23 12:00:06 +08:00 |
|
huangdeliang
|
81ce32847a
|
修复错误
|
2021-02-22 19:59:14 +08:00 |
|
德仔
|
5c5709d606
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop
|
2021-02-22 19:49:36 +08:00 |
|
huangdeliang
|
de4e43af4e
|
修复选项
|
2021-02-22 19:45:33 +08:00 |
|
huangdeliang
|
3f620ed894
|
生成食谱接口对接
|
2021-02-22 19:36:01 +08:00 |
|
xiezhijun
|
473ccef008
|
外食计算器优化，营养成分以及热量比例数据计算
|
2021-02-22 19:30:33 +08:00 |
|
huangdeliang
|
a7ca979d06
|
菜品增删查改对接
|
2021-02-20 19:46:13 +08:00 |
|
xiezhijun
|
3f3fcda862
|
外食计算器功能优化修改
|
2021-02-20 19:38:17 +08:00 |
|
xiezhijun
|
20371f9469
|
外食计算器
|
2021-02-19 19:14:26 +08:00 |
|
huangdeliang
|
854171897d
|
食谱编辑交互
|
2021-02-19 19:08:08 +08:00 |
|
xiezhijun
|
3c42485f52
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-02-19 09:33:00 +08:00 |
|
huangdeliang
|
e404c3be1a
|
完成菜品修改
|
2021-02-18 17:05:10 +08:00 |
|
huangdeliang
|
3554bee2b3
|
修复样式遮挡
|
2021-02-09 15:07:27 +08:00 |
|
huangdeliang
|
5f4b1ec33f
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop
|
2021-02-09 14:17:37 +08:00 |
|
huangdeliang
|
1775b657a7
|
修复菜品修改问题
|
2021-02-09 14:10:47 +08:00 |
|