Commit Graph

Select branches

Hide Pull Requests

es

feature/main20240421

fxshop

lszyh

main

master

pifa

v1.0

wechat

wxl

wysf

zzzyh

#1

#5

Mono Color

• 11badcb84e 门店入驻后台接口 ztt 2024-02-28 22:00:45 +0800
• a4d44d7b10 回收单状态修改 ztt 2024-02-28 21:50:53 +0800
• 7520a4f11b 1 ztt 2024-02-28 21:38:37 +0800
• bcc28e4675 门店入驻 ztt 2024-02-28 21:33:06 +0800
• 2fa9595730 1 ztt 2024-02-28 20:38:46 +0800
• f587bbb766 修复浏览记录 ztt 2024-02-28 20:33:04 +0800
• 2d1744746b 1 ztt 2024-02-28 20:23:05 +0800
• a09683a219 Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-28 18:54:54 +0800
• 533a968201 后台门店管理调整 ztt 2024-02-28 18:54:46 +0800
• 2f955a0c23 1 lqmac 2024-02-28 17:23:44 +0800
• 822ccb6418 修改保存 remark 字段 Wayne 2024-02-28 17:21:06 +0800
• e6172eec0f 门店评论增删改查 ztt 2024-02-28 16:51:38 +0800
• bf5db8ca89 门店评论增删改查 ztt 2024-02-28 16:33:33 +0800
• ed8d5d663d 数据统计 ztt 2024-02-28 15:42:20 +0800
• 0842541d4d 订单添加成本价 ztt 2024-02-28 14:13:51 +0800
• d7eca1bb4c 门店评论修改 ztt 2024-02-28 13:46:23 +0800
• 808b3d7da9 Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-28 11:42:39 +0800
• fa33583b3c 多规格商品价格修改 ztt 2024-02-28 11:42:34 +0800
• e30b35a33c Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong Wayne 2024-02-28 11:02:14 +0800
• 40ad39eaae 更新 Wayne 2024-02-28 11:02:05 +0800
• 17db9815be Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-28 09:58:34 +0800
• 254873d3e7 商品价格修改优化 ztt 2024-02-28 09:58:28 +0800
• 6746ae8124 1 lqmac 2024-02-28 00:47:00 +0800
• 2924e4851f 1 ztt 2024-02-27 23:25:44 +0800
• dee8e4f863 1 ztt 2024-02-27 23:23:30 +0800
• e706d91c9d 1 ztt 2024-02-27 22:42:15 +0800
• a38c1172b7 更新商城 Wayne 2024-02-27 22:35:50 +0800
• 761fbf251c Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong Wayne 2024-02-27 22:34:06 +0800
• ffb2cf800e 更新活动接口 Wayne 2024-02-27 22:33:59 +0800
• f4463a951c 1 ztt 2024-02-27 22:01:07 +0800
• a2d4d99b0c 数据统计 ztt 2024-02-27 17:02:38 +0800
• 8cd121de65 数据统计 ztt 2024-02-27 16:37:47 +0800
• 702d1acdb7 活动接口调整 ztt 2024-02-27 15:54:21 +0800
• 875a131332 后台-图片处理 674780036@qq.com 2024-02-27 14:26:41 +0800
• 2c11f483e6 后台-图片处理 674780036@qq.com 2024-02-27 13:57:22 +0800
• 6ebedbe576 1 ztt 2024-02-27 11:31:02 +0800
• 0a7efe2a07 店长端订单统计不计入user_id ztt 2024-02-27 11:05:23 +0800
• 3c41a28530 1 ztt 2024-02-27 10:42:57 +0800
• f9fa7df920 1 lqmac 2024-02-27 09:42:16 +0800
• 3ef01a61c8 1 lqmac 2024-02-27 09:32:31 +0800
• b5cbc8b4f1 Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong Wayne 2024-02-27 09:16:21 +0800
• 387e1ecf3a 活动接口 Wayne 2024-02-27 09:16:03 +0800
• 55e11a59bf 分销订单-分销会员到期后，不生成分销订单；分销续期的时候，只更新分销会员时间，不生成分销用户；购买分销会员的时候，更新字段fx_effective_time #1 674780036@qq.com 2024-02-27 02:23:14 +0800
• e167dba8f4 1 lqmac 2024-02-27 00:32:09 +0800
• c6eb85e852 Merge branch 'main' into wxl 674780036@qq.com 2024-02-26 23:41:57 +0800
• a4734f7415 分销订单-分销时间到期改状态 674780036@qq.com 2024-02-26 23:41:21 +0800
• 82ea25f1fe 分销订单-佣金列表 674780036@qq.com 2024-02-26 23:01:50 +0800
• cf1e787717 普通会员和plus会员添加查询条件 ztt 2024-02-26 23:01:19 +0800
• 6dcd77de8e Merge branch 'main' into wxl 674780036@qq.com 2024-02-26 22:21:10 +0800
• 4ca768f2e0 1 ztt 2024-02-26 21:51:15 +0800
• d4d1aee59e Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-26 21:18:35 +0800
• aac5e719df 下单接口添加字段 ztt 2024-02-26 21:18:30 +0800
• 82168322b1 1 lqmac 2024-02-26 21:11:41 +0800
• 3e9d8aa588 Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-26 17:54:31 +0800
• dffb33b703 订单详情下发字段 ztt 2024-02-26 17:54:27 +0800
• 054a5b96ba 1 lqmac 2024-02-26 17:44:10 +0800
• 1533f61ad3 update Wayne 2024-02-26 17:02:56 +0800
• bd56c67224 update Wayne 2024-02-26 17:01:47 +0800
• 2c74675e17 Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-26 16:59:25 +0800
• c45d3c1d80 订单列表添加筛选条件 ztt 2024-02-26 16:59:21 +0800
• cd25d217d8 更新接口 Wayne 2024-02-26 16:05:09 +0800
• c12d1c0b8c 更新轮播图相关接口 Wayne 2024-02-26 15:54:56 +0800
• a1771b455c 优化售后单列表数据结构 ztt 2024-02-26 14:11:30 +0800
• 5e50441f75 Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-26 13:54:59 +0800
• 2e13cb8fba 优化售后单列表数据结构 ztt 2024-02-26 13:54:50 +0800
• 786be2e8b3 1 wanghousheng 2024-02-26 13:24:59 +0800
• 5dd2fdc3a8 1 wanghousheng 2024-02-26 13:21:13 +0800
• 6eddbf732c 1 wanghousheng 2024-02-26 13:17:35 +0800
• 6e3cf5d79c 1 wanghousheng 2024-02-26 13:13:57 +0800
• b3bd0e3d08 1 wanghousheng 2024-02-26 13:13:18 +0800
• 4ffc59fe8a 1 wanghousheng 2024-02-26 13:03:33 +0800
• 48c7f8cf32 Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-26 12:52:13 +0800
• fbffab507b 1 ztt 2024-02-26 12:51:27 +0800
• d77af2917a 1 wanghousheng 2024-02-26 12:48:52 +0800
• a891693107 分销商-判断是否是分销商 674780036@qq.com 2024-02-26 11:43:10 +0800
• 3048b9a993 1 ztt 2024-02-26 11:40:01 +0800
• 22e5694174 Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-26 11:37:44 +0800
• 7de68fab79 1 ztt 2024-02-26 11:37:37 +0800
• 18c8a8666b 1 lqmac 2024-02-26 11:33:57 +0800
• 9796022bcc Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong lqmac 2024-02-26 11:30:53 +0800
• e4fb435e37 1 lqmac 2024-02-26 11:30:37 +0800
• 47365d35a6 1 ztt 2024-02-26 11:21:33 +0800
• 8d2048fe2a del cart ztt 2024-02-26 11:19:23 +0800
• 266f300a6d 店长退款查询优化 ztt 2024-02-26 11:13:49 +0800
• 99b4420459 修改订单查询状态和店长发货校验 ztt 2024-02-26 11:04:56 +0800
• 4fd3f66b04 合并代码,解决冲突 674780036@qq.com 2024-02-26 00:54:12 +0800
• 52add5541a 分销订单加上收货人 674780036@qq.com 2024-02-26 00:45:02 +0800
• c692588543 1 ztt 2024-02-26 00:22:00 +0800
• de78cd109d 用户下单统计和用户行为统计 ztt 2024-02-26 00:19:33 +0800
• 6771fe5cda 分销订单加上待付款，待支付等状态筛选 674780036@qq.com 2024-02-26 00:03:13 +0800
• 255b72272f 更新货源增删改查 Wayne 2024-02-25 23:57:13 +0800
• 57e22aa859 Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong Wayne 2024-02-25 23:37:56 +0800
• f346ccc222 update Wayne 2024-02-25 23:37:08 +0800
• 879a03e5a2 分销订单带关键字 674780036@qq.com 2024-02-25 22:30:48 +0800
• 8f90a6251e 分销订单查询带上商品信息 674780036@qq.com 2024-02-25 21:02:05 +0800
• 9a3174cba7 退款接口修改 674780036@qq.com 2024-02-25 19:17:03 +0800
• 47c55a1051 用户服务订单模块联调门店返回坐标 ztt 2024-02-25 16:02:34 +0800
• de5c23dfec 订单状态查询修改 674780036@qq.com 2024-02-25 10:52:19 +0800
• 800ad4ae4b Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main ztt 2024-02-25 08:26:18 +0800
• 7b5feda868 物流信息查询兼容和协议报错 ztt 2024-02-25 08:26:10 +0800