xiezhijun
|
0f03406d4c
|
工资比例计算
|
2021-03-15 18:01:59 +08:00 |
|
huangdeliang
|
0f201eb2fd
|
放开调整时间
|
2021-03-13 11:52:56 +08:00 |
|
德仔
|
1ec57480d7
|
!126 购物车添加文字
Merge pull request !126 from 德仔/develop
|
2021-03-12 19:00:45 +08:00 |
|
huangdeliang
|
80ac974977
|
购物车添加文字
|
2021-03-12 18:59:50 +08:00 |
|
德仔
|
4761f83a94
|
!125 修复了修改订单时带上了加*的手机号问题
Merge pull request !125 from 德仔/xzj
|
2021-03-12 18:23:27 +08:00 |
|
huangdeliang
|
ac7ae33142
|
删除未审核的食谱计划
|
2021-03-12 18:20:43 +08:00 |
|
xiezhijun
|
c22bb0b0c9
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-12 17:56:43 +08:00 |
|
xiezhijun
|
e2ac5553fc
|
修复了修改订单时带上了加*的手机号问题
|
2021-03-12 17:56:26 +08:00 |
|
huangdeliang
|
ae62ffd41e
|
修复拖动
|
2021-03-12 15:05:16 +08:00 |
|
huangdeliang
|
a2773a75c3
|
修复健康信息
|
2021-03-12 14:50:35 +08:00 |
|
huangdeliang
|
9b3e474023
|
修改成7天体验
|
2021-03-12 09:33:04 +08:00 |
|
huangdeliang
|
c6a3a9da2e
|
修复冲突
|
2021-03-11 18:51:29 +08:00 |
|
xiezhijun
|
cd7e18cc0b
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
# Conflicts:
# stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
|
2021-03-11 18:44:51 +08:00 |
|
xiezhijun
|
41d8df3895
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-11 18:43:55 +08:00 |
|
xiezhijun
|
da905e1092
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
# Conflicts:
# stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
|
2021-03-11 18:43:30 +08:00 |
|
德仔
|
a2d4c579cc
|
!119 新增1天体验
Merge pull request !119 from 德仔/develop
|
2021-03-11 18:39:37 +08:00 |
|
huangdeliang
|
c959692e9a
|
新增1天体验
|
2021-03-11 18:36:34 +08:00 |
|
xiezhijun
|
2b571aca92
|
菜品添加、查询优化
|
2021-03-11 18:31:34 +08:00 |
|
德仔
|
b6b60b72e3
|
!118 调整食谱制作页面
Merge pull request !118 from 德仔/develop
|
2021-03-11 16:51:09 +08:00 |
|
huangdeliang
|
c166c1e29c
|
1，修复复制数据问题
2，调整食谱制作界面
|
2021-03-11 16:50:13 +08:00 |
|
德仔
|
9f33dcc439
|
!117 模板选择时添加筛选功能
Merge pull request !117 from 德仔/develop
|
2021-03-11 11:39:39 +08:00 |
|
huangdeliang
|
59dabbc9d3
|
模板选择时添加筛选功能
|
2021-03-11 11:37:54 +08:00 |
|
德仔
|
9946667f88
|
!116 修复食谱制作问题
Merge pull request !116 from 德仔/develop
|
2021-03-10 19:12:12 +08:00 |
|
huangdeliang
|
fc9086103f
|
1，保持字体
2，替换菜品时备注
3，修复未生成食谱时多次粘贴后删除全删
|
2021-03-10 19:10:57 +08:00 |
|
德仔
|
415e7f3859
|
!115 菜品加大类、小类
Merge pull request !115 from 德仔/xzj
|
2021-03-10 17:38:18 +08:00 |
|
德仔
|
6e742dfdab
|
!114 采购计划开发
Merge pull request !114 from 德仔/develop
|
2021-03-10 17:37:03 +08:00 |
|
xiezhijun
|
989889f4cf
|
菜品加大类、小类
|
2021-03-10 17:36:10 +08:00 |
|
huangdeliang
|
aa555d98c2
|
采购计划开发
|
2021-03-10 17:35:19 +08:00 |
|
德仔
|
f2eb689db5
|
!113 案例管理优化
Merge pull request !113 from 德仔/xzj
|
2021-03-09 18:28:43 +08:00 |
|
德仔
|
ff4476532e
|
!112 修改食谱展示
Merge pull request !112 from 德仔/develop
|
2021-03-09 18:27:55 +08:00 |
|
huangdeliang
|
7709c85cb0
|
修改食谱展示
|
2021-03-09 18:26:48 +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
|
9ccd7ab17c
|
生成模板
|
2021-03-08 16:05:49 +08:00 |
|
huangdeliang
|
b3ce59ff25
|
另存为模板功能
|
2021-03-08 16:04:36 +08:00 |
|
huangdeliang
|
ff89b9bf5e
|
修复食谱生成bug
|
2021-03-08 11:32:27 +08:00 |
|
德仔
|
c9a8264f1e
|
!105 修复粘贴功能
Merge pull request !105 from 德仔/develop
|
2021-03-06 18:36:27 +08:00 |
|
huangdeliang
|
7bcae39c0f
|
修复粘贴功能
|
2021-03-06 18:35:31 +08:00 |
|
德仔
|
f584f29685
|
!103 增加备注信息
Merge pull request !103 from 德仔/develop
|
2021-03-06 18:24:01 +08:00 |
|
huangdeliang
|
f217adec10
|
增加备注信息
|
2021-03-06 18:17:25 +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 |
|