huangdeliang
|
7a3ab6bfef
|
客户档案调整
|
2021-03-16 15:05:53 +08:00 |
|
德仔
|
02c085b2e6
|
!132 工资比例计算
Merge pull request !132 from 德仔/xzj
|
2021-03-15 20:59:02 +08:00 |
|
huangdeliang
|
f461c32c52
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop
|
2021-03-15 20:55:55 +08:00 |
|
huangdeliang
|
f02235936c
|
完成忌口检查
|
2021-03-15 20:53:32 +08:00 |
|
xiezhijun
|
579a8b31ab
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-15 18:02:20 +08:00 |
|
xiezhijun
|
0f03406d4c
|
工资比例计算
|
2021-03-15 18:01:59 +08:00 |
|
德仔
|
c88a57a029
|
!131 调整
Merge pull request !131 from 德仔/develop
|
2021-03-15 14:12:12 +08:00 |
|
huangdeliang
|
5167828ff8
|
调整
|
2021-03-15 14:11:22 +08:00 |
|
德仔
|
ae982051aa
|
!130 修复另存为
Merge pull request !130 from 德仔/develop
|
2021-03-15 11:39:35 +08:00 |
|
huangdeliang
|
8155373958
|
修复另存为
|
2021-03-15 11:38:09 +08:00 |
|
德仔
|
e445f40d1d
|
!129 食谱制作状态
Merge pull request !129 from 德仔/develop
|
2021-03-13 20:01:04 +08:00 |
|
huangdeliang
|
79a1c4c554
|
修复健康信息
|
2021-03-13 20:00:18 +08:00 |
|
huangdeliang
|
3056bc2b84
|
修复病史数据
|
2021-03-13 19:25:44 +08:00 |
|
huangdeliang
|
cac31face0
|
修复保存后url
|
2021-03-13 18:30:07 +08:00 |
|
huangdeliang
|
51be6ba97a
|
食谱制作状态
|
2021-03-13 18:21:03 +08:00 |
|
德仔
|
a3b07ae8a0
|
!127 食谱计划优化
Merge pull request !127 from 德仔/xzj
|
2021-03-13 17:16:58 +08:00 |
|
xiezhijun
|
2e11a4a0ee
|
订单查询优化
|
2021-03-13 16:32:27 +08:00 |
|
xiezhijun
|
9d03073763
|
食谱计划更新
|
2021-03-13 15:40:34 +08:00 |
|
xiezhijun
|
c4cb3e2180
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-13 12:31:09 +08:00 |
|
德仔
|
6fc379613f
|
!128 放开调整时间
Merge pull request !128 from 德仔/develop
|
2021-03-13 11:53:48 +08:00 |
|
huangdeliang
|
0f201eb2fd
|
放开调整时间
|
2021-03-13 11:52:56 +08:00 |
|
xiezhijun
|
20a30369bc
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-13 11:41:30 +08:00 |
|
xiezhijun
|
5de284c1d9
|
食谱计划优化
|
2021-03-13 11:41:14 +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 |
|
德仔
|
ef26d65b1f
|
!124 删除未审核的食谱计划
Merge pull request !124 from 德仔/develop
|
2021-03-12 18:22:23 +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 |
|
德仔
|
0bc895ecff
|
!123 修复健康信息
Merge pull request !123 from 德仔/develop
|
2021-03-12 15:00:10 +08:00 |
|
huangdeliang
|
a2773a75c3
|
修复健康信息
|
2021-03-12 14:50:35 +08:00 |
|
德仔
|
bb70517634
|
!122 修改成7天体验
Merge pull request !122 from 德仔/develop
|
2021-03-12 09:34:23 +08:00 |
|
huangdeliang
|
9b3e474023
|
修改成7天体验
|
2021-03-12 09:33:04 +08:00 |
|
德仔
|
4049242806
|
!121 修复冲突
Merge pull request !121 from 德仔/develop
|
2021-03-11 18:52:14 +08:00 |
|
huangdeliang
|
c6a3a9da2e
|
修复冲突
|
2021-03-11 18:51:29 +08:00 |
|
德仔
|
fd05af8a6b
|
!120 合并
Merge pull request !120 from 德仔/xzj
|
2021-03-11 18:46:25 +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 |
|