德仔
|
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 |
|
德仔
|
98ee348f2f
|
!240 视频上传修改优化
Merge pull request !240 from 德仔/xzj
|
2021-05-10 20:49:30 +08:00 |
|
xiezhijun
|
776f8761ad
|
视频上传修改优化
|
2021-05-10 18:42:13 +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 |
|
德仔
|
cf764ae860
|
!236 视频列表优化
Merge pull request !236 from 德仔/xzj
|
2021-05-07 19:46:17 +08:00 |
|
德仔
|
dc05f20d78
|
!235 修复时间错乱
Merge pull request !235 from 德仔/develop
|
2021-05-07 19:45:12 +08:00 |
|
xiezhijun
|
d474e823c3
|
合并
|
2021-05-07 18:44:12 +08:00 |
|
xiezhijun
|
2033e4cb43
|
视频列表优化
|
2021-05-07 18:37:53 +08:00 |
|
德仔
|
a5c1483076
|
!235 修复时间错乱
Merge pull request !235 from 德仔/develop
|
2021-05-07 17:46:57 +08:00 |
|
huangdeliang
|
6b784c3f1f
|
修复时间错乱
|
2021-05-07 17:45:15 +08:00 |
|
德仔
|
13d21550c8
|
!234 修复问题
Merge pull request !234 from 德仔/develop
|
2021-05-07 17:10:16 +08:00 |
|
huangdeliang
|
bb88894068
|
修复问题
|
2021-05-07 17:09:23 +08:00 |
|
huangdeliang
|
272d8c833a
|
修复问题
|
2021-05-07 17:09:12 +08:00 |
|
德仔
|
0225b91e92
|
!233 修改微信基础数据
Merge pull request !233 from 德仔/develop
|
2021-05-07 16:39:09 +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 |
|
德仔
|
c8e0c16bfe
|
!232 视频上传页面优化
Merge pull request !232 from 德仔/xzj
|
2021-05-07 10:16:36 +08:00 |
|
xiezhijun
|
344800dcfe
|
视频上传页面优化
|
2021-05-07 10:14:07 +08:00 |
|
德仔
|
4b42b721dd
|
!231 提成优化，视频管理优化
Merge pull request !231 from 德仔/xzj
|
2021-05-06 21:54:49 +08:00 |
|
xiezhijun
|
9f2b055dee
|
提成优化，视频管理优化
|
2021-05-06 19:53:31 +08:00 |
|
德仔
|
6a5581faaa
|
!230 提成优化，视频页面
Merge pull request !230 from 德仔/xzj
|
2021-05-06 17:11:19 +08:00 |
|
xiezhijun
|
79f1b9b23c
|
提成优化，视频页面
|
2021-05-06 17:08:55 +08:00 |
|
德仔
|
d7934d6197
|
!229 视频后台管理，提成计算优化
Merge pull request !229 from 德仔/xzj
|
2021-05-05 19:47:34 +08:00 |
|
xiezhijun
|
7236ef518e
|
视频后台管理，提成计算优化
|
2021-05-05 19:44:48 +08:00 |
|
xiezhijun
|
aae8475eb2
|
视频获取优化
|
2021-04-30 18:51:39 +08:00 |
|
德仔
|
d900fe84e6
|
!228 视频播放参数修改
Merge pull request !228 from 德仔/xzj
|
2021-04-30 17:23:52 +08:00 |
|
xiezhijun
|
af72e645f1
|
视频播放参数修改
|
2021-04-30 17:21:12 +08:00 |
|
德仔
|
89bcc34e0f
|
!227 视频功能
Merge pull request !227 from 德仔/xzj
|
2021-04-29 21:02:43 +08:00 |
|
xiezhijun
|
941f34d201
|
视频功能
|
2021-04-29 21:01:21 +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 |
|
德仔
|
8cd676aace
|
!226 视频功能
Merge pull request !226 from 德仔/xzj
|
2021-04-29 20:46:36 +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 |
|
德仔
|
3478669604
|
!225 视频功能
视频功能
|
2021-04-29 13:35:42 +08:00 |
|
xiezhijun
|
be67dc5890
|
视频功能
|
2021-04-29 13:10:51 +08:00 |
|
xiezhijun
|
0f21d54c5e
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-04-28 20:48:24 +08:00 |
|
xiezhijun
|
90126a3d4c
|
阿里云视频点播功能
|
2021-04-28 20:48:02 +08:00 |
|
德仔
|
fb9d35c753
|
!224 新增消息中心功能
Merge pull request !224 from 德仔/xzj
|
2021-04-28 13:35:36 +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 |
|