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 |
|
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 |
|
德仔
|
b4f70fa741
|
!64 外食计算器功能优化修改
Merge pull request !64 from 德仔/xzj
|
2021-02-22 09:03:36 +08:00 |
|
huangdeliang
|
a7ca979d06
|
菜品增删查改对接
|
2021-02-20 19:46:13 +08:00 |
|
xiezhijun
|
3f3fcda862
|
外食计算器功能优化修改
|
2021-02-20 19:38:17 +08:00 |
|
德仔
|
afdee0abdf
|
!63 外食计算器
Merge pull request !63 from 德仔/xzj
|
2021-02-19 19:16:58 +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 |
|
德仔
|
cdb4db2ffb
|
!62 修复样式遮挡
Merge pull request !62 from 德仔/develop
|
2021-02-09 15:09:44 +08:00 |
|
huangdeliang
|
3554bee2b3
|
修复样式遮挡
|
2021-02-09 15:07:27 +08:00 |
|
德仔
|
223525b313
|
!61 修复菜品修改问题
Merge pull request !61 from 德仔/develop
|
2021-02-09 14:17:58 +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 |
|
德仔
|
ab630fd612
|
!60 修复通俗重量
Merge pull request !60 from 德仔/develop
|
2021-02-09 10:27:08 +08:00 |
|
huangdeliang
|
afb7465281
|
修复通俗重量
|
2021-02-09 10:25:34 +08:00 |
|
huangdeliang
|
f8f40dc91c
|
食谱制作界面
|
2021-02-06 19:29:53 +08:00 |
|
huangdeliang
|
c800fb1aa3
|
食谱制作界面
|
2021-02-06 19:29:33 +08:00 |
|
xiezhijun
|
9a2e9bde62
|
订单类型改版
|
2021-02-06 18:34:57 +08:00 |
|
德仔
|
65859f17ba
|
!59 客户健康信息加上备注编辑修改
Merge pull request !59 from 德仔/xzj
|
2021-02-06 09:33:16 +08:00 |
|
xiezhijun
|
87735820d9
|
客户健康信息加上备注编辑修改
|
2021-02-05 18:31:13 +08:00 |
|
huangdeliang
|
d78cb2f870
|
文件夹改名2
|
2021-02-05 08:36:01 +08:00 |
|
huangdeliang
|
e13260c891
|
文件夹改名1
|
2021-02-05 08:35:39 +08:00 |
|
德仔
|
c602cbc0d0
|
!58 微信导粉统计
Merge pull request !58 from 德仔/xzj
|
2021-02-04 21:16:50 +08:00 |
|
德仔
|
615286a1ae
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into xzj
|
2021-02-04 21:16:35 +08:00 |
|
xiezhijun
|
0283eb0a1d
|
微信导粉统计
|
2021-02-04 20:12:46 +08:00 |
|
德仔
|
8427a85afb
|
!57 修复虚拟订单逻辑
Merge pull request !57 from 德仔/develop
|
2021-02-03 18:59:25 +08:00 |
|