171 Commits

Author SHA1 Message Date
huangdeliang
fc9086103f 1,保持字体
2,替换菜品时备注
3,修复未生成食谱时多次粘贴后删除全删
2021-03-10 19:10:57 +08:00
德仔
f2eb689db5 !113 案例管理优化
Merge pull request !113 from 德仔/xzj
2021-03-09 18:28:43 +08:00
xiezhijun
addf0fc000 案例管理优化 2021-03-09 18:25:13 +08:00
德仔
1bfa9e65fc !111 修复食谱计划
Merge pull request !111 from 德仔/develop
2021-03-09 11:51:59 +08:00
huangdeliang
032b4e8106 修复食谱计划 2021-03-09 11:50:00 +08:00
德仔
5bbf47ea48 !110 案例文件下载上传优化
Merge pull request !110 from 德仔/xzj
2021-03-09 11:23:12 +08:00
xiezhijun
4b58e1b6bc 案例文件下载上传优化 2021-03-09 11:21:30 +08:00
德仔
a557098d1c !109 案例文件打包下载
Merge pull request !109 from 德仔/xzj
2021-03-08 18:53:48 +08:00
huangdeliang
bddc3c7f85 修复食谱计划获取id错误 2021-03-08 18:51:40 +08:00
xiezhijun
728b93cbdc Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-08 18:00:43 +08:00
xiezhijun
39ff2ed69c 案例文件打包下载 2021-03-08 18:00:25 +08:00
huangdeliang
b3ce59ff25 另存为模板功能 2021-03-08 16:04:36 +08:00
huangdeliang
ff89b9bf5e 修复食谱生成bug 2021-03-08 11:32:27 +08:00
xiezhijun
e35992d984 案例修改、图片预览 2021-03-06 18:06:39 +08:00
德仔
edd5b5559d !102 修复订单
Merge pull request !102 from 德仔/develop
2021-03-06 14:51:47 +08:00
huangdeliang
01f5c98954 修复订单 2021-03-06 14:50:36 +08:00
德仔
9cdefdb81b !100 修复食谱展示页面
Merge pull request !100 from 德仔/develop
2021-03-06 14:19:21 +08:00
huangdeliang
f82e87fe55 补充二维码 2021-03-06 14:18:00 +08:00
xiezhijun
f1adbb041f 案例管理的文件下载 2021-03-06 00:15:27 +08:00
xiezhijun
c507057f63 合并 2021-03-05 20:17:35 +08:00
xiezhijun
b4d5eabf32 案例管理 2021-03-05 20:15:05 +08:00
huangdeliang
a50c6afa49 增加二维码功能 2021-03-05 17:19:18 +08:00
huangdeliang
96a405a314 添加备注,柱状图标线 2021-03-03 19:25:03 +08:00
huangdeliang
b8fad6218f 修复权限 2021-03-03 16:43:58 +08:00
huangdeliang
ecbc4705a2 调整权限标识 2021-03-02 15:33:53 +08:00
xiezhijun
f92e07f1ed 订单优化、提成分为审核、未审核 2021-03-01 19:00:01 +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
德仔
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
204529f52e 订单相关优化 2021-02-25 17:30:51 +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
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
德仔
5c5709d606 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-02-22 19:49:36 +08:00
huangdeliang
3f620ed894 生成食谱接口对接 2021-02-22 19:36:01 +08:00
xiezhijun
473ccef008 外食计算器优化,营养成分以及热量比例数据计算 2021-02-22 19:30:33 +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