1245 Commits

Author SHA1 Message Date
德仔
d70b7164fe !261 提成优化,加上替换订单
Merge pull request !261 from 德仔/xzj
2021-05-29 09:28:25 +08:00
xiezhijun
d48cecc923 提成优化,加上替换订单 2021-05-28 18:32:20 +08:00
xiezhijun
0122c35553 提成优化,需要加上更换订单提成详情 2021-05-28 00:46:21 +08:00
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
德仔
4c7c70c623 !260 建客户档案时根据直播记录匹配营养师
Merge pull request !260 from 德仔/xzj
2021-05-27 09:18:36 +08:00
xiezhijun
cf766cb817 建客户档案时根据直播记录匹配营养师 2021-05-26 19:06:14 +08:00
huangdeliang
57dd7c3043 暂存 2021-05-26 18:11:12 +08:00
德仔
b249035da0 !259 修复接口
Merge pull request !259 from 德仔/develop
2021-05-25 10:28:08 +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
德仔
fe1691970d !258 导粉记录优化,采购计划SQL优化,后续建立索引
Merge pull request !258 from 德仔/xzj
2021-05-25 09:33:10 +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
德仔
e5202f2992 !256 导粉记录页面以及接口修改
Merge pull request !256 from 德仔/xzj
2021-05-21 19:21:22 +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
德仔
fdf44c3624 !255 优化食谱计划详情全查询
Merge pull request !255 from 德仔/develop
2021-05-21 11:58:02 +08:00
huangdeliang
0b973ab796 优化食谱计划详情全查询 2021-05-21 11:56:15 +08:00
huangdeliang
562180c7d4 修复customerId为空时错误 2021-05-21 09:34:26 +08:00
xiezhijun
17df1db9e2 导粉记录 2021-05-20 18:59:03 +08:00
xiezhijun
574c8b424e 导粉统计,更新客户手机号时更新下微信用户对应的客户ID 2021-05-19 19:18:18 +08:00
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