385 Commits

Author SHA1 Message Date
huangdeliang
7ea959e741 修改updateSysRecipesPlan接口 2021-05-15 17:23:59 +08:00
huangdeliang
c8714a5354 订阅消息推送 2021-05-15 14:31:30 +08:00
德仔
c6fdacd9ba !247 微信接口开发
Merge pull request !247 from 德仔/develop
2021-05-14 21:02:54 +08:00
xiezhijun
85f362e775 排班优化加上一键复制功能,营养知识列表、视频列表加上创建时间 2021-05-14 18:38:25 +08:00
huangdeliang
1df264e603 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-05-14 09:20:13 +08:00
huangdeliang
8b068b0f1a 微信接口开发 2021-05-13 20:27:17 +08:00
huangdeliang
e6a1a8d8ca 微信接口开发 2021-05-13 20:25:04 +08:00
huangdeliang
037480cc32 微信接口开发 2021-05-13 20:20:06 +08:00
德仔
8c2ab96881 !245 直播记录排班
Merge pull request !245 from 德仔/xzj
2021-05-13 20:03:53 +08:00
huangdeliang
735296b0f9 微信接口开发 2021-05-13 20:01:15 +08:00
xiezhijun
55b78c3840 直播记录排班 2021-05-13 19:59:34 +08:00
huangdeliang
65d1c156fd Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-05-11 16:02:13 +08:00
huangdeliang
e5fb063b57 微信食谱开发 2021-05-11 16:00:04 +08:00
xiezhijun
47d94b75ae 去除@JsonIgnore注解,会导致get方法取不到值 2021-05-11 14:19:07 +08:00
xiezhijun
4eea399904 代码合并 2021-05-11 11:25:31 +08:00
xiezhijun
edea626f73 暂停查询计算服务到期时间、查询生成食谱计划优化,不再去掉 2021-05-11 11:19:15 +08:00
德仔
44e540642f !239 调整个人信息顺序
Merge pull request !239 from 德仔/develop
2021-05-10 14:51:52 +08:00
huangdeliang
d736726b24 调整个人信息顺序 2021-05-10 14:50:00 +08:00
德仔
102f6a87f6 !238 视频接口优化,案例检索
Merge pull request !238 from 德仔/xzj
2021-05-08 20:20:55 +08:00
xiezhijun
8600f48740 视频接口优化,案例检索 2021-05-08 19:09:32 +08:00
德仔
6f3ff16e3c !237 修改微信统计导出顺序固定
Merge pull request !237 from 德仔/develop
2021-05-08 10:57:13 +08:00
huangdeliang
2b6cc96016 修改微信统计导出顺序固定 2021-05-08 10:56:09 +08:00
xiezhijun
d474e823c3 合并 2021-05-07 18:44:12 +08:00
xiezhijun
2033e4cb43 视频列表优化 2021-05-07 18:37:53 +08:00
huangdeliang
6b784c3f1f 修复时间错乱 2021-05-07 17:45:15 +08:00
huangdeliang
bb88894068 修复问题 2021-05-07 17:09:23 +08:00
huangdeliang
272d8c833a 修复问题 2021-05-07 17:09:12 +08:00
huangdeliang
8fe1a3eba6 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-05-07 14:54:16 +08:00
huangdeliang
ca5e1bb5f1 修改微信基础数据 2021-05-07 14:53:26 +08:00
xiezhijun
9f2b055dee 提成优化,视频管理优化 2021-05-06 19:53:31 +08:00
xiezhijun
79f1b9b23c 提成优化,视频页面 2021-05-06 17:08:55 +08:00
xiezhijun
7236ef518e 视频后台管理,提成计算优化 2021-05-05 19:44:48 +08:00
xiezhijun
af72e645f1 视频播放参数修改 2021-04-30 17:21:12 +08:00
huangdeliang
a7238b5b88 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-04-29 20:59:54 +08:00
huangdeliang
8e260f9d39 暂存 2021-04-29 20:59:14 +08:00
xiezhijun
6eef8ae29e 视频功能 2021-04-29 20:45:31 +08:00
huangdeliang
ec71568749 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-04-29 17:00:31 +08:00
huangdeliang
7aea0f67d5 整理小程序接口 2021-04-29 16:58:01 +08:00
xiezhijun
be67dc5890 视频功能 2021-04-29 13:10:51 +08:00
xiezhijun
90126a3d4c 阿里云视频点播功能 2021-04-28 20:48:02 +08:00
xiezhijun
bab4569b43 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-27 19:49:05 +08:00
xiezhijun
bbbc4f2753 新增消息中心功能 2021-04-27 19:48:22 +08:00
huangdeliang
484fe1cdeb 食谱制作菜品选择增加食材条件筛选 2021-04-27 17:18:54 +08:00
德仔
f6f4efa6fc !222 新增食谱制作时按病症筛选功能
Merge pull request !222 from 德仔/develop
2021-04-27 11:56:18 +08:00
huangdeliang
a24a9e8674 新增食谱制作时按病症筛选功能 2021-04-27 11:55:11 +08:00
xiezhijun
d5e9933fe7 营养知识提问SQL修改 2021-04-26 18:57:50 +08:00
xiezhijun
571415473b 营养小知识提问优化 2021-04-24 18:22:13 +08:00
xiezhijun
b94071e141 营养知识新加问题添加 2021-04-23 19:06:04 +08:00
xiezhijun
cb1300c593 打卡优化,加上编辑 2021-04-22 18:35:25 +08:00
德仔
ac2e282b48 !218 按天提成明细报错修改
Merge pull request !218 from 德仔/xzj
2021-04-21 18:45:13 +08:00