1425 Commits

Author SHA1 Message Date
德仔
dd02be417b !342 修复图片导出问题
Merge pull request !342 from 德仔/develop
2021-08-06 07:03:38 +00:00
huangdeliang
f866c6874c Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop 2021-08-06 14:53:12 +08:00
huangdeliang
5bbcc13821 修复图片导出问题 2021-08-06 14:52:53 +08:00
xiezhijun
ecdc5d1802 小程序消息中心接口优化 2021-08-06 14:26:19 +08:00
huangdeliang
34bc27681d 调整接口 2021-08-06 11:38:04 +08:00
huangdeliang
af814fb1e1 修复没有头像不能登录的问题 2021-08-05 10:36:30 +08:00
huangdeliang
875473b668 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop 2021-08-04 17:52:34 +08:00
huangdeliang
90f79a689c 暂存 2021-08-04 17:46:01 +08:00
xiezhijun
1f5fe09639 小程序消息中心接口 2021-08-04 15:48:50 +08:00
xiezhijun
4311cc4f2a Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-08-02 18:15:44 +08:00
xiezhijun
238042409d 未打卡用户列表 2021-08-02 18:15:26 +08:00
德仔
6245010261 !341 打卡点赞
Merge pull request !341 from 德仔/develop
2021-08-02 03:48:27 +00:00
huangdeliang
b1305e4e79 打卡点赞 2021-08-02 11:47:24 +08:00
德仔
dcae5727f8 !340 模板检索语句修改,新增编辑时加上关键词
Merge pull request !340 from 德仔/xzj
2021-07-31 11:06:01 +00:00
德仔
5e1dfb59ad !339 打卡点赞
Merge pull request !339 from 德仔/develop
2021-07-31 11:04:57 +00:00
huangdeliang
a383ef99f7 打卡点赞 2021-07-31 19:03:27 +08:00
xiezhijun
3000bbbbbe Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-07-31 17:36:00 +08:00
xiezhijun
a8a933cdca 模板检索语句修改,新增编辑时加上关键词 2021-07-31 17:35:44 +08:00
德仔
5e69e7df1e !338 打卡点赞
Merge pull request !338 from 德仔/develop
2021-07-31 07:56:32 +00:00
huangdeliang
392b9f673a 打卡点赞 2021-07-31 15:54:44 +08:00
德仔
4b22ad0310 !337 打卡点赞
Merge pull request !337 from 德仔/develop
2021-07-31 07:44:33 +00:00
huangdeliang
b4f9d053fe 打卡点赞 2021-07-31 15:43:29 +08:00
德仔
98ba5a0f53 !336 打卡点赞
Merge pull request !336 from 德仔/develop
2021-07-31 07:41:50 +00:00
huangdeliang
1f980fed22 打卡点赞 2021-07-31 15:40:58 +08:00
huangdeliang
7cc1bc0dee 打卡点赞 2021-07-31 15:39:30 +08:00
德仔
7cff464e6c !335 打卡点赞
Merge pull request !335 from 德仔/develop
2021-07-31 07:33:22 +00:00
huangdeliang
84e5ef340d Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-07-31 15:30:58 +08:00
huangdeliang
6ca76e0473 打卡点赞 2021-07-31 15:22:06 +08:00
德仔
7a166a22fe !334 食谱制作页面,添加左侧显示用户信息功能
Merge pull request !334 from 德仔/develop
2021-07-31 03:47:43 +00:00
huangdeliang
ecde8c470a 食谱制作页面,添加左侧显示用户信息功能 2021-07-31 11:46:30 +08:00
德仔
e30a8adc53 !333 新增基因下单
Merge pull request !333 from 德仔/xzj
2021-07-30 10:39:12 +00:00
xiezhijun
12f6a1e680 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-07-30 18:35:12 +08:00
xiezhijun
0260f8aa4a 新增基因下单 2021-07-30 18:32:27 +08:00
德仔
9c250b877b !332 视频点播使用cdn加速
Merge pull request !332 from 德仔/develop
2021-07-30 07:40:48 +00:00
huangdeliang
088f895860 打卡点赞 2021-07-30 15:39:19 +08:00
德仔
fb0b6231de !331 签合同前端页面修改
Merge pull request !331 from 德仔/xzj
2021-07-30 07:37:08 +00:00
xiezhijun
47f767f5e0 签合同前端页面修改 2021-07-30 15:35:37 +08:00
xiezhijun
05b5b2b570 更新增重合同PDF文件 2021-07-30 15:03:52 +08:00
德仔
cccbeca0f4 !330 拖动排序
Merge pull request !330 from 德仔/develop
2021-07-29 06:32:24 +00:00
huangdeliang
9d88fdc1e0 拖动排序 2021-07-29 14:31:01 +08:00
德仔
4d64e2465b !329 订单新增商务下单
Merge pull request !329 from 德仔/xzj
2021-07-28 10:33:52 +00:00
xiezhijun
3626c48d84 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-07-28 17:54:37 +08:00
xiezhijun
769b5faa11 订单新增商务下单 2021-07-28 17:54:20 +08:00
德仔
35aabc1e45 !328 打卡点赞
Merge pull request !328 from 德仔/develop
2021-07-27 12:31:11 +00:00
huangdeliang
e54b05b833 打卡点赞 2021-07-27 20:29:59 +08:00
德仔
a58160f073 !327 修复图片上传OSS路径缺失问题
Merge pull request !327 from 德仔/xzj
2021-07-26 10:39:25 +00:00
德仔
4e6f60616d !326 修改获取打卡数据接口
Merge pull request !326 from 德仔/develop
2021-07-26 10:38:24 +00:00
huangdeliang
e7d76b9a37 修改获取打卡数据接口 2021-07-26 18:37:15 +08:00
xiezhijun
119261aad6 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-07-26 18:17:18 +08:00
xiezhijun
2c2b77fcc3 修复图片上传OSS路径缺失问题 2021-07-26 18:17:01 +08:00