882 Commits

Author SHA1 Message Date
德仔
8cd948c730 !95 修复修改问题
Merge pull request !95 from 德仔/develop
2021-03-05 16:31:47 +08:00
huangdeliang
17b7c04f6d 修复修改问题 2021-03-05 16:30:14 +08:00
德仔
bea88507d3 !94 修改样式,添加字体修改
Merge pull request !94 from 德仔/develop
2021-03-05 15:45:59 +08:00
huangdeliang
4c654d8617 修改样式,添加字体修改 2021-03-05 15:44:45 +08:00
huangdeliang
4f08bedf61 复制功能 2021-03-05 14:32:47 +08:00
xiezhijun
a15e90171b Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-05 09:02:29 +08:00
huangdeliang
0d36574c50 注释代码 2021-03-04 20:54:44 +08:00
huangdeliang
97790b817a Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop 2021-03-04 20:53:36 +08:00
xiezhijun
7672f44404 配置提交 2021-03-04 20:52:06 +08:00
德仔
a675d46dbd !93 修复菜品新增错误
Merge pull request !93 from 德仔/develop
2021-03-04 20:38:46 +08:00
德仔
65f0f64b03 !92 案例管理,添加修改暂停优化,判断时间不能重叠
Merge pull request !92 from 德仔/xzj
2021-03-04 20:36:58 +08:00
xiezhijun
2a7c499b24 案例管理,添加修改暂停优化,判断时间不能重叠 2021-03-04 18:35:06 +08:00
huangdeliang
8e3142553b 修复菜品新增错误 2021-03-04 18:02:19 +08:00
德仔
f70b85a2ed !91 修复餐类锁定
Merge pull request !91 from 德仔/develop
2021-03-04 17:44:37 +08:00
huangdeliang
324b6344b7 修复餐类锁定 2021-03-04 17:43:35 +08:00
德仔
46bd587aef !90 新增替换功能,快速增加餐类菜品
Merge pull request !90 from 德仔/develop
2021-03-04 16:52:08 +08:00
huangdeliang
bea29e310e 新增替换功能,快速增加餐类菜品 2021-03-04 16:50:51 +08:00
德仔
39171fd12d !89 食谱计划优化
Merge pull request !89 from 德仔/xzj
2021-03-03 19:27:02 +08:00
德仔
4880a16faa !88 添加备注,柱状图标线
Merge pull request !88 from 德仔/develop
2021-03-03 19:26:17 +08:00
huangdeliang
96a405a314 添加备注,柱状图标线 2021-03-03 19:25:03 +08:00
xiezhijun
a20ef83dc4 食谱计划优化 2021-03-03 18:17:03 +08:00
xiezhijun
77148e9067 Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-03 16:44:24 +08:00
huangdeliang
b8fad6218f 修复权限 2021-03-03 16:43:58 +08:00
xiezhijun
4943af635f 合并主分支内容 2021-03-03 16:19:02 +08:00
xiezhijun
97deafb62d 食谱计划生成优化 2021-03-03 16:07:52 +08:00
德仔
cc629ac18f !87 添加回车功能
Merge pull request !87 from 德仔/develop
2021-03-03 14:39:30 +08:00
huangdeliang
333f930b8c 添加回车功能 2021-03-03 14:36:21 +08:00
德仔
6fc785acab !86 修复食材分量不正确问题
Merge pull request !86 from 德仔/develop
2021-03-03 14:21:50 +08:00
huangdeliang
7e97f8510f 修复食材分量不正确问题 2021-03-03 14:20:55 +08:00
德仔
dc7102f6bb !85 订单相关优化、健康评估报告模板修改
Merge pull request !85 from 德仔/xzj
2021-03-03 13:59:43 +08:00
德仔
a64f316ef3 !84 修复创建模板问题
Merge pull request !84 from 德仔/develop
2021-03-03 13:53:45 +08:00
huangdeliang
92081f7035 修复创建模板问题 2021-03-03 13:46:20 +08:00
德仔
a339c0d931 !83 调整删除错误
Merge pull request !83 from 德仔/develop
2021-03-02 19:23:30 +08:00
huangdeliang
297a97db9e 调整删除错误 2021-03-02 19:22:26 +08:00
huangdeliang
14f7113765 修复暂停计划 2021-03-02 18:56:31 +08:00
huangdeliang
0f47bb8bc9 添加暂停计划 2021-03-02 18:56:19 +08:00
xiezhijun
29d5818874 订单相关优化、健康评估报告模板修改 2021-03-02 17:39:25 +08:00
德仔
bbb3ea795f !82 调整权限标识
Merge pull request !82 from 德仔/develop
2021-03-02 15:35:31 +08:00
huangdeliang
ecbc4705a2 调整权限标识 2021-03-02 15:33:53 +08:00
德仔
b2feaff34a !81 食谱模板功能完成
Merge pull request !81 from 德仔/develop
2021-03-01 19:05:52 +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
德仔
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