huangdeliang
|
f682efe758
|
退出关闭ws
|
2021-06-03 14:26:02 +08:00 |
|
huangdeliang
|
13cb91cd92
|
调整
|
2021-06-03 14:10:24 +08:00 |
|
huangdeliang
|
6238dffef0
|
Merge branch 'develop' of gitee.com:darlk/ShengTangManage into develop
|
2021-06-03 11:24:37 +08:00 |
|
huangdeliang
|
a3ea4edcf4
|
调整ws连接时机
|
2021-06-03 11:24:29 +08:00 |
|
德仔
|
f2d4dc6c79
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop
|
2021-06-03 10:50:24 +08:00 |
|
huangdeliang
|
ea8276e6a0
|
完善交互
|
2021-06-03 10:36:21 +08:00 |
|
德仔
|
b4c7fb50e3
|
!270 售中提成计算，售前推送提成计算，优化修改客户手机号时更改绑定对应的微信用户逻辑
Merge pull request !270 from 德仔/xzj
|
2021-06-03 09:28:42 +08:00 |
|
xiezhijun
|
c43ca57dd4
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-06-02 18:19:26 +08:00 |
|
xiezhijun
|
0d7f9478fa
|
售中提成计算，售前推送提成计算，优化修改客户手机号时更改绑定对应的微信用户逻辑
|
2021-06-02 18:19:01 +08:00 |
|
huangdeliang
|
953d188f50
|
修改端口
|
2021-06-02 14:13:03 +08:00 |
|
huangdeliang
|
a4252af6ed
|
修复ws
|
2021-06-02 14:11:15 +08:00 |
|
huangdeliang
|
cfe970bd45
|
开发ws链接
|
2021-06-02 14:06:21 +08:00 |
|
德仔
|
bd7474871d
|
!269 加上售中下单逻辑，修改账号渠道，进粉统计的渠道和下单时保持一致
Merge pull request !269 from 德仔/xzj
|
2021-06-01 21:03:31 +08:00 |
|
xiezhijun
|
7cb4122891
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-06-01 19:25:03 +08:00 |
|
xiezhijun
|
77a8668b5d
|
加上售中下单逻辑，修改账号渠道，进粉统计的渠道和下单时保持一致
|
2021-06-01 19:24:40 +08:00 |
|
德仔
|
7d36193da2
|
!268 添加图片导出时设置目标天数
Merge pull request !268 from 德仔/develop
|
2021-06-01 15:01:57 +08:00 |
|
huangdeliang
|
d7368a2e0e
|
添加图片导出时设置目标天数
|
2021-06-01 14:59:05 +08:00 |
|
德仔
|
c46ed33273
|
!267 管理后台前端搭建
Merge pull request !267 from 德仔/develop
|
2021-05-31 19:44:45 +08:00 |
|
huangdeliang
|
d86bdedf79
|
修复测试数据
|
2021-05-31 19:39:30 +08:00 |
|
德仔
|
5fa207749f
|
!266 合同修改，去掉5.10条事项
Merge pull request !266 from 德仔/xzj
|
2021-05-31 19:35:34 +08:00 |
|
huangdeliang
|
0e08a1fef8
|
管理后台前端搭建
|
2021-05-31 19:34:04 +08:00 |
|
xiezhijun
|
783fd6fe3b
|
合同修改，去掉5.10条事项
|
2021-05-31 18:34:29 +08:00 |
|
德仔
|
dc661d6d0d
|
!265 调整界面
Merge pull request !265 from 德仔/develop
|
2021-05-31 10:53:33 +08:00 |
|
huangdeliang
|
7e3311ad64
|
调整界面
|
2021-05-31 10:52:30 +08:00 |
|
德仔
|
16b299e589
|
!264 食谱计划添加发送按钮
Merge pull request !264 from 德仔/develop
|
2021-05-29 16:24:16 +08:00 |
|
huangdeliang
|
b31aafc6e4
|
食谱计划添加发送按钮
|
2021-05-29 16:21:11 +08:00 |
|
德仔
|
87e38a5366
|
!263 体验单也需要生成食谱计划
Merge pull request !263 from 德仔/develop
|
2021-05-29 11:42:03 +08:00 |
|
huangdeliang
|
455cc51f17
|
体验单也需要生成食谱计划
|
2021-05-29 11:38:59 +08:00 |
|
德仔
|
21d3cdc60d
|
!262 修复翻页
Merge pull request !262 from 德仔/develop
|
2021-05-29 10:48:56 +08:00 |
|
huangdeliang
|
8d7417f77e
|
修复翻页
|
2021-05-29 10:48:05 +08:00 |
|
德仔
|
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 |
|