328 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
root	9443f4959a	Merge pull request 'java脚本报错修改' (#100) from cxw into master ... Reviewed-on: #100	2024-11-03 18:29:13 +08:00
XinWei	00d292e5cf	java脚本报错修改	2024-11-01 17:12:43 +08:00
root	837aa53c11	Merge pull request '优化自提门店接口' (#99) from sjy-two into master ... Reviewed-on: #99	2024-11-01 16:52:13 +08:00
sonjinyon	bd834f366d	优化自提门店接口	2024-11-01 16:48:06 +08:00
root	e9c46ea4e1	Merge pull request '名字修改' (#97) from cxw into master ... Reviewed-on: #97	2024-10-30 14:07:09 +08:00
XinWei	bca9290872	名字修改	2024-10-30 14:06:34 +08:00
root	7ad4e0ed52	Merge pull request '构建修改' (#96) from cxw into master ... Reviewed-on: #96	2024-10-30 14:05:17 +08:00
XinWei	c373bcb8e0	构建vue	2024-10-30 14:03:58 +08:00
XinWei	fb40e7fb15	构建vue	2024-10-30 14:01:27 +08:00
XinWei	9fd3f4b7e2	构建vue	2024-10-30 13:09:14 +08:00
XinWei	4fc63dc326	构建java	2024-10-30 13:09:07 +08:00
XinWei	19c6fec3dc	vue和java同时构建	2024-10-30 13:08:53 +08:00
root	fb3bdc1558	Merge pull request 'cxw' (#95) from cxw into master ... Reviewed-on: #95	2024-10-30 11:36:37 +08:00
XinWei	be9593e214	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-30 11:12:42 +08:00
XinWei	eead90abb2	新增vue3构建脚本	2024-10-30 11:12:27 +08:00
root	527e0210de	Merge pull request '活动商品接口' (#94) from sjy-two into master ... Reviewed-on: #94	2024-10-29 18:39:55 +08:00
sonjinyon	074278c9bd	活动商品接口	2024-10-29 18:36:11 +08:00
root	7dcb1ef9a9	Merge pull request '会员支付优化(现金支付)' (#93) from khy1 into master ... Reviewed-on: #93	2024-10-29 18:34:46 +08:00
khy	566cf302c4	会员支付优化(现金支付)	2024-10-29 18:29:55 +08:00
root	232976d532	Merge pull request '提交遗漏文件' (#92) from sjy-two into master ... Reviewed-on: #92	2024-10-29 13:16:08 +08:00
sonjinyon	547448fc44	提交遗漏文件	2024-10-29 13:13:55 +08:00
root	f2297720fc	Merge pull request '会员支付优化' (#91) from khy1 into master ... Reviewed-on: #91	2024-10-29 11:53:15 +08:00
khy	e406f885d9	会员支付优化	2024-10-29 11:50:33 +08:00
root	f7f702673b	Merge pull request '客服话术和素材图片添加分类' (#90) from sjy-two into master ... Reviewed-on: #90	2024-10-29 11:30:45 +08:00
sonjinyon	1a0cfaac2b	优化客服话术和图片素材界面	2024-10-29 11:29:11 +08:00
sonjinyon	c6c4dd7693	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two	2024-10-29 11:01:31 +08:00
sonjinyon	1ca6b87037	客服话术和素材图片添加分类	2024-10-29 10:59:39 +08:00
root	e68b6ed573	Merge pull request '添加客服话术分类，图片素材分类' (#88) from sjy-two into master ... Reviewed-on: #88	2024-10-28 11:34:10 +08:00
root	eadb727812	Merge pull request '会员记录支付状态' (#89) from khy1 into master ... Reviewed-on: #89	2024-10-28 11:14:16 +08:00
khy	cbdbf6fa01	会员记录支付状态	2024-10-28 11:09:09 +08:00
sonjinyon	ccbdf82114	添加客服话术分类，图片素材分类	2024-10-28 10:36:25 +08:00
root	5235fae53c	Merge pull request 'khy1' (#87) from khy1 into master ... Reviewed-on: #87	2024-10-28 10:29:06 +08:00
khy	6c29031b3b	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1	2024-10-28 10:22:58 +08:00
khy	b6b82502e0	会员协议	2024-10-28 10:22:38 +08:00
root	0eabf4fc3c	Merge pull request 'khy1' (#86) from khy1 into master ... Reviewed-on: #86	2024-10-25 17:48:40 +08:00
khy	0621b9823b	交易订单	2024-10-25 17:46:26 +08:00
root	12dd84bb4c	Merge pull request '交易' (#85) from khy1 into master ... Reviewed-on: #85	2024-10-25 16:44:40 +08:00
khy	35cea73266	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1	2024-10-25 16:42:50 +08:00
root	b24c6d3157	Merge pull request 'sjy-two' (#84) from sjy-two into master ... Reviewed-on: #84	2024-10-25 16:39:13 +08:00
khy	36b7469e1e	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1	2024-10-25 16:38:55 +08:00
khy	a163a6490f	交易	2024-10-25 16:38:16 +08:00
sonjinyon	67459fe554	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two	2024-10-25 16:23:44 +08:00
root	a521d1c674	Merge pull request '交易订单' (#83) from khy1 into master ... Reviewed-on: #83	2024-10-25 16:20:39 +08:00
khy	783ab383ec	交易订单	2024-10-25 16:19:29 +08:00
root	21a0e43cc1	Merge pull request '新增交易订单' (#82) from khy1 into master ... Reviewed-on: #82	2024-10-25 16:16:52 +08:00
khy	f8de72bc6a	新增交易订单	2024-10-25 16:14:01 +08:00
sonjinyon	c58893d335	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two	2024-10-25 16:05:47 +08:00
sonjinyon	aa3d6de962	调整积分商城，我的积分数据显示，兑换记录详情	2024-10-25 15:51:43 +08:00
root	45b6bf142e	Merge pull request '支付bug' (#79) from khy1 into master ... Reviewed-on: #79	2024-10-25 14:48:48 +08:00
khy	6beabe3478	支付bug	2024-10-25 14:38:59 +08:00