huangdeliang
|
47f77bcc6f
|
修复热量饼图
|
2021-03-18 19:52:10 +08:00 |
|
德仔
|
16ae8663dd
|
!146 增加bmi值展示
Merge pull request !146 from 德仔/develop
|
2021-03-18 19:18:07 +08:00 |
|
huangdeliang
|
871f3dc056
|
增加bmi值展示
|
2021-03-18 19:16:06 +08:00 |
|
德仔
|
e26a542987
|
!145 适配中文文件
Merge pull request !145 from 德仔/develop
|
2021-03-18 16:47:30 +08:00 |
|
huangdeliang
|
a10b8715ce
|
适配中文文件
|
2021-03-18 16:45:24 +08:00 |
|
德仔
|
8f1c94a3af
|
!144 备注信息可换行
Merge pull request !144 from 德仔/develop
|
2021-03-18 14:32:13 +08:00 |
|
huangdeliang
|
4fc71f9ac0
|
备注信息可换行
|
2021-03-18 14:31:04 +08:00 |
|
德仔
|
b6cd58c553
|
!143 修复上传图片功能
Merge pull request !143 from 德仔/develop
|
2021-03-18 14:02:40 +08:00 |
|
huangdeliang
|
683593ba16
|
修复上传图片功能
|
2021-03-18 14:02:12 +08:00 |
|
德仔
|
86aa3e4898
|
!142 减脂指导修改界面优化
Merge pull request !142 from 德仔/xzj
|
2021-03-18 11:57:15 +08:00 |
|
德仔
|
8b3ae9c299
|
!141 修复阿里云oss空指针
Merge pull request !141 from 德仔/develop
|
2021-03-18 11:56:29 +08:00 |
|
huangdeliang
|
84c851d1db
|
修复阿里云oss空指针
|
2021-03-18 11:55:44 +08:00 |
|
xiezhijun
|
75d11bb9e3
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-17 18:37:00 +08:00 |
|
xiezhijun
|
b78a68c807
|
减脂指导修改界面优化
|
2021-03-17 18:36:46 +08:00 |
|
德仔
|
65b6505ef0
|
!140 修复tooltip
Merge pull request !140 from 德仔/develop
|
2021-03-17 17:45:34 +08:00 |
|
huangdeliang
|
f4521ec9dd
|
修复tooltip
|
2021-03-17 17:44:42 +08:00 |
|
德仔
|
5d38073bcc
|
!139 添加热量分析图表
Merge pull request !139 from 德仔/develop
|
2021-03-17 17:26:00 +08:00 |
|
huangdeliang
|
9d9701f235
|
调整
|
2021-03-17 17:24:49 +08:00 |
|
huangdeliang
|
b36cef2948
|
添加热量分析图表
|
2021-03-17 17:17:09 +08:00 |
|
德仔
|
5ec05d913b
|
!136 页面食谱修复备注信息
Merge pull request !136 from 德仔/develop
|
2021-03-17 14:01:59 +08:00 |
|
huangdeliang
|
64d232d2d6
|
页面食谱修复备注信息
|
2021-03-17 13:58:05 +08:00 |
|
德仔
|
d903f64c7a
|
!135 修复表名称
Merge pull request !135 from 德仔/develop
|
2021-03-17 13:46:54 +08:00 |
|
huangdeliang
|
8124005e7e
|
修复表名称
|
2021-03-17 13:45:54 +08:00 |
|
德仔
|
b037802a9c
|
!133 食材添加信息
Merge pull request !133 from 德仔/develop
|
2021-03-16 20:10:50 +08:00 |
|
huangdeliang
|
1b5a4f3777
|
食材添加信息
|
2021-03-16 20:09:28 +08:00 |
|
xiezhijun
|
b65f9534e1
|
Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-03-16 17:56:45 +08:00 |
|
huangdeliang
|
03eb2508b6
|
食材添加信息
|
2021-03-16 17:53:17 +08:00 |
|
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
|
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 |
|
huangdeliang
|
5167828ff8
|
调整
|
2021-03-15 14:11:22 +08:00 |
|
huangdeliang
|
8155373958
|
修复另存为
|
2021-03-15 11:38:09 +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 |
|
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 |
|