1012 Commits

Author SHA1 Message Date
huangdeliang
8cc48dd276 修改名字 2021-03-23 20:18:47 +08:00
德仔
ec0b426ceb !163 新增忌口编写功能
Merge pull request !163 from 德仔/develop
2021-03-23 20:11:26 +08:00
huangdeliang
2ea3d01d6e 新增忌口编写功能 2021-03-23 20:10:29 +08:00
德仔
ea25149d0b !162 打卡后台,小程序接口
Merge pull request !162 from 德仔/xzj
2021-03-23 18:48:39 +08:00
xiezhijun
c2d6a3c3df Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-23 18:46:24 +08:00
xiezhijun
0ab35ed6c7 打卡后台,小程序接口 2021-03-23 18:46:10 +08:00
德仔
6c7a0f197e !161 图片预览
Merge pull request !161 from 德仔/develop
2021-03-23 15:15:02 +08:00
huangdeliang
960a094649 图片预览 2021-03-23 15:14:02 +08:00
德仔
af7c5f9588 !160 图片预览
Merge pull request !160 from 德仔/develop
2021-03-23 15:08:01 +08:00
huangdeliang
2159605a3b 图片预览 2021-03-23 15:07:00 +08:00
德仔
f3d8ab4a96 !159 图片预览
Merge pull request !159 from 德仔/develop
2021-03-23 14:43:32 +08:00
huangdeliang
424b98ad57 图片预览 2021-03-23 14:42:01 +08:00
xiezhijun
354e464ebb Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-23 11:34:29 +08:00
xiezhijun
7952bdb03e 微信打卡接口优化 2021-03-23 11:34:17 +08:00
德仔
726f4e6b9d !158 生成食谱并制作完成后不能直接改未审核
Merge pull request !158 from 德仔/develop
2021-03-23 11:03:44 +08:00
huangdeliang
cdb93a1702 生成食谱并制作完成后不能直接改未审核 2021-03-23 11:03:16 +08:00
德仔
414bcd0939 !157 调整饼图
Merge pull request !157 from 德仔/develop
2021-03-23 10:08:16 +08:00
huangdeliang
d91543ea5e 调整饼图 2021-03-23 10:01:53 +08:00
德仔
f1386bb21d !156 图表宽度
Merge pull request !156 from 德仔/develop
2021-03-22 19:53:15 +08:00
huangdeliang
0e5eeac7d4 图表宽度 2021-03-22 19:52:08 +08:00
德仔
510769cc25 !155 修复删除&食谱展示
Merge pull request !155 from 德仔/develop
2021-03-22 19:45:34 +08:00
huangdeliang
c536b20b63 修复删除&食谱展示 2021-03-22 19:44:20 +08:00
xiezhijun
23bdf241e4 还原打卡记录SQL 2021-03-22 19:15:12 +08:00
huangdeliang
6d912988ac 调整食谱信息顺序 2021-03-22 17:57:44 +08:00
德仔
d1af8341f6 !154 调整图表展示
Merge pull request !154 from 德仔/develop
2021-03-22 17:02:04 +08:00
huangdeliang
8328cbab3a 调整评估项顺序 2021-03-22 17:00:39 +08:00
huangdeliang
5f84333c30 调整图表展示 2021-03-22 16:58:19 +08:00
xiezhijun
4294ab57c7 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-22 15:52:21 +08:00
xiezhijun
1d66f7334a 微信小程序打卡接口 2021-03-22 15:51:55 +08:00
德仔
bee860e4b9 !153 优化校验逻辑
Merge pull request !153 from 德仔/develop
2021-03-20 19:33:01 +08:00
huangdeliang
180f994141 优化校验逻辑 2021-03-20 19:31:00 +08:00
德仔
cec3b4794e !152 修复老的体征数据备注修改
Merge pull request !152 from 德仔/develop
2021-03-19 18:58:32 +08:00
huangdeliang
21fac2ae86 修复老的体征数据备注修改 2021-03-19 18:57:07 +08:00
德仔
76d2b5b2fb !151 客户案例修改
Merge pull request !151 from 德仔/xzj
2021-03-19 18:13:23 +08:00
德仔
82c5ccd1c5 !150 跟换菜品控件
Merge pull request !150 from 德仔/develop
2021-03-19 17:19:04 +08:00
huangdeliang
efd7820da5 调整操作 2021-03-19 17:18:37 +08:00
huangdeliang
144e3550aa 跟换菜品控件 2021-03-19 17:08:21 +08:00
xiezhijun
636a808d3a Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-19 16:02:25 +08:00
xiezhijun
8c3eb7ab9c 客户案例修改 2021-03-19 16:02:12 +08:00
德仔
c2eec4e305 !149 图片预览功能
Merge pull request !149 from 德仔/develop
2021-03-19 10:56:50 +08:00
huangdeliang
5f7e4c45db 图片预览功能 2021-03-19 10:55:51 +08:00
德仔
66a8be2b6d !148 修复热量饼图
Merge pull request !148 from 德仔/develop
2021-03-18 19:53:18 +08:00
huangdeliang
47f77bcc6f 修复热量饼图 2021-03-18 19:52:10 +08:00
德仔
2d1eef6436 !147 去除食谱生成的时间限制,小程序获取案例接口
Merge pull request !147 from 德仔/xzj
2021-03-18 19:19:54 +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
xiezhijun
88f6b8e955 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-18 18:48:49 +08:00
xiezhijun
9cc0ad82cd 去除食谱生成的时间限制,小程序获取案例接口 2021-03-18 18:48:28 +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