xiezhijun
|
7cac34799c
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-05-19 18:42:52 +08:00 |
|
德仔
|
02a3e487f7
|
!254 修复食谱展示
Merge pull request !254 from 德仔/develop
|
2021-05-19 18:02:39 +08:00 |
|
huangdeliang
|
84e9236208
|
修复食谱展示
|
2021-05-19 18:02:12 +08:00 |
|
xiezhijun
|
bfe9a581e5
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-05-19 17:29:04 +08:00 |
|
德仔
|
da996db774
|
!253 修复未登录微信客户错误
Merge pull request !253 from 德仔/develop
|
2021-05-18 20:47:57 +08:00 |
|
huangdeliang
|
7358117a3b
|
修复未登录微信客户错误
|
2021-05-18 20:44:02 +08:00 |
|
xiezhijun
|
c802d5151f
|
导粉记录部分功能
|
2021-05-18 18:49:20 +08:00 |
|
德仔
|
feba9801d5
|
!252 添加订阅情况
Merge pull request !252 from 德仔/develop
|
2021-05-18 16:07:26 +08:00 |
|
huangdeliang
|
1cadc3e777
|
添加订阅情况
|
2021-05-18 16:06:29 +08:00 |
|
德仔
|
458c6e2468
|
!251 修复未登录过小程序导致的问题
Merge pull request !251 from 德仔/develop
|
2021-05-18 14:30:35 +08:00 |
|
huangdeliang
|
c1197025b3
|
修复未登录过小程序导致的问题
|
2021-05-18 14:28:33 +08:00 |
|
德仔
|
94a2d09bdc
|
!250 完成小程序消息订阅
Merge pull request !250 from 德仔/develop
|
2021-05-18 14:17:19 +08:00 |
|
huangdeliang
|
6ac09ed80a
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop
|
2021-05-18 14:03:40 +08:00 |
|
huangdeliang
|
55a7e5e54f
|
完成小程序消息订阅
|
2021-05-18 14:02:56 +08:00 |
|
德仔
|
6cea0a6d3c
|
!249 更新
Merge pull request !249 from 德仔/xzj
|
2021-05-18 12:25:09 +08:00 |
|
xiezhijun
|
4c57672097
|
更新
|
2021-05-18 12:24:04 +08:00 |
|
德仔
|
b6f24411fb
|
!248 导粉记录
Merge pull request !248 from 德仔/xzj
|
2021-05-18 12:00:31 +08:00 |
|
xiezhijun
|
cc6bbec22e
|
导粉记录
|
2021-05-17 18:35:53 +08:00 |
|
xiezhijun
|
11a4c69fef
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-05-17 16:31:51 +08:00 |
|
xiezhijun
|
ba103faaea
|
食谱计划优化，直播记录优化，加上了食谱计划是否连续的字段
|
2021-05-17 16:29:49 +08:00 |
|
huangdeliang
|
2e83c4be3c
|
调试接口
|
2021-05-15 18:56:27 +08:00 |
|
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 |
|
德仔
|
057a0f51d6
|
!246 排班优化加上一键复制功能，营养知识列表、视频列表加上创建时间
Merge pull request !246 from 德仔/xzj
|
2021-05-14 21:01:42 +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 |
|
德仔
|
74ec83008c
|
!244 微信接口开发
Merge pull request !244 from 德仔/develop
|
2021-05-13 20:02:56 +08:00 |
|
huangdeliang
|
735296b0f9
|
微信接口开发
|
2021-05-13 20:01:15 +08:00 |
|
xiezhijun
|
55b78c3840
|
直播记录排班
|
2021-05-13 19:59:34 +08:00 |
|
德仔
|
07374cbee1
|
!243 微信接口开发
Merge pull request !243 from 德仔/develop
|
2021-05-13 18:00:45 +08:00 |
|
huangdeliang
|
2e8e6d7b8d
|
微信接口开发
|
2021-05-13 17:59:23 +08:00 |
|
huangdeliang
|
7332ce7649
|
微信接口开发
|
2021-05-13 17:51:50 +08:00 |
|
huangdeliang
|
1426d2ab51
|
微信接口开发
|
2021-05-13 17:48:31 +08:00 |
|
huangdeliang
|
fa8d0a5f19
|
微信接口开发
|
2021-05-13 17:45:10 +08:00 |
|
huangdeliang
|
96e6135bb8
|
微信接口开发
|
2021-05-13 17:30:02 +08:00 |
|
huangdeliang
|
8511939835
|
微信接口开发
|
2021-05-13 17:05:14 +08:00 |
|
huangdeliang
|
8aab2a67e7
|
微信接口开发
|
2021-05-13 17:00:07 +08:00 |
|
德仔
|
ad068ed3ea
|
!242 新增接口
Merge pull request !242 from 德仔/develop
|
2021-05-12 19:19:37 +08:00 |
|
huangdeliang
|
7b16561591
|
新增接口
|
2021-05-12 19:18:05 +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 |
|
德仔
|
96274e3abc
|
!241 去除@JsonIgnore注解，会导致get方法取不到值
Merge pull request !241 from 德仔/xzj
|
2021-05-11 14:24:57 +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 |
|