466 Commits

Author SHA1 Message Date
xiezhijun
e333cb007e 提成明细需要加上替换的订单 2021-05-27 20:03:43 +08:00
huangdeliang
836f328c09 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-05-27 17:48:57 +08:00
xiezhijun
01fd29f2ec Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj 2021-05-27 16:40:17 +08:00
huangdeliang
e5def38565 暂存 2021-05-27 16:35:09 +08:00
xiezhijun
cf766cb817 建客户档案时根据直播记录匹配营养师 2021-05-26 19:06:14 +08:00
huangdeliang
57dd7c3043 暂存 2021-05-26 18:11:12 +08:00
huangdeliang
2e6df9e862 修复接口 2021-05-25 10:26:39 +08:00
huangdeliang
14e3f4b88b 修复接口 2021-05-25 10:26:13 +08:00
huangdeliang
4137d96cee Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-05-25 10:20:33 +08:00
huangdeliang
ee4f3c29d5 接口开发完成 2021-05-25 10:15:55 +08:00
xiezhijun
c82d5b25e5 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-05-24 16:45:47 +08:00
xiezhijun
ddd4b3763c 导粉记录优化,采购计划SQL优化,后续建立索引 2021-05-24 16:41:11 +08:00
德仔
869a5743b4 !257 优化推送模板
Merge pull request !257 from 德仔/develop
2021-05-24 11:20:51 +08:00
huangdeliang
416189781f 优化推送模板 2021-05-24 11:18:19 +08:00
huangdeliang
44786bb6bc 修改推送备注默认值 2021-05-22 10:10:04 +08:00
xiezhijun
167cb3fda0 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-05-21 18:59:52 +08:00
xiezhijun
f913774025 导粉记录页面以及接口修改 2021-05-21 18:59:26 +08:00
huangdeliang
0b973ab796 优化食谱计划详情全查询 2021-05-21 11:56:15 +08:00
xiezhijun
17df1db9e2 导粉记录 2021-05-20 18:59:03 +08:00
xiezhijun
574c8b424e 导粉统计,更新客户手机号时更新下微信用户对应的客户ID 2021-05-19 19:18:18 +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
huangdeliang
7358117a3b 修复未登录微信客户错误 2021-05-18 20:44:02 +08:00
xiezhijun
c802d5151f 导粉记录部分功能 2021-05-18 18:49:20 +08:00
huangdeliang
1cadc3e777 添加订阅情况 2021-05-18 16:06:29 +08:00
huangdeliang
c1197025b3 修复未登录过小程序导致的问题 2021-05-18 14:28:33 +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
xiezhijun
4c57672097 更新 2021-05-18 12:24:04 +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
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