lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								16b652be7b
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/DMJS-IT/merchant-web
							
							
							
							
							
						 | 
						
							2025-07-02 01:20:37 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								6cda281507
								
							
						 | 
						
							
							
								
								feat: 设置菜单权限
							
							
							
							
							
						 | 
						
							2025-07-02 01:20:15 +08:00 | 
						
					
				
					
						
							
							
								 
								yukai
							
						 | 
						
							
							
							
							
							
								
							
							
								482dbbeb0a
								
							
						 | 
						
							
							
								
								修改构建配置文件
							
							
							
							
	
		
			
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing
				
					Details
				
			 
		
	 
							
						 | 
						
							2025-06-29 12:05:06 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								c50758dcb8
								
							
						 | 
						
							
							
								
								feat: 商品管理bug修改
							
							
							
							
	
		
			
	
		
	
	
		
			
				
	
				continuous-integration/drone Build is failing
				
					Details
				
			 
		
	 
							
						 | 
						
							2025-06-28 00:40:52 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								03bc91f984
								
							
						 | 
						
							
							
								
								fix: 处理商家端后台的问题
							
							
							
							
							
						 | 
						
							2025-06-23 09:14:31 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								a3a1c08527
								
							
						 | 
						
							
							
								
								fix: 积分订单问题、会员等级设置问题
							
							
							
							
							
						 | 
						
							2025-06-16 10:21:11 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								bd156edb60
								
							
						 | 
						
							
							
								
								fix: 预售订单增加参数
							
							
							
							
							
						 | 
						
							2025-06-12 21:35:05 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								ced8d97cf7
								
							
						 | 
						
							
							
								
								fix: 增加查询字段,需要等接口配合
							
							
							
							
							
						 | 
						
							2025-06-10 14:33:17 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								746c671538
								
							
						 | 
						
							
							
								
								fix: 预售订单列表简单处理
							
							
							
							
							
						 | 
						
							2025-06-05 16:33:34 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								1314bdb200
								
							
						 | 
						
							
							
								
								feat: 预售订单接口对接
							
							
							
							
							
						 | 
						
							2025-06-05 16:10:10 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								63dc65eafb
								
							
						 | 
						
							
							
								
								fix: 修改bug
							
							
							
							
							
						 | 
						
							2025-06-03 23:00:25 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								e451cc6544
								
							
						 | 
						
							
							
								
								feat: 增加购物须知配置模块
							
							
							
							
							
						 | 
						
							2025-05-20 21:58:14 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								5ab6d86bd9
								
							
						 | 
						
							
							
								
								fix: 修改新增预售的内容
							
							
							
							
							
						 | 
						
							2025-05-15 21:26:10 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								7a9f8ca0d4
								
							
						 | 
						
							
							
								
								fix: 定金可退配置问题
							
							
							
							
							
						 | 
						
							2025-05-10 14:39:15 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								eb0cb2a0a6
								
							
						 | 
						
							
							
								
								fix: 设置定金不可退配置为0
							
							
							
							
							
						 | 
						
							2025-05-10 13:48:27 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								f5f010c6f1
								
							
						 | 
						
							
							
								
								feat: 品牌开启分销
							
							
							
							
							
						 | 
						
							2025-05-06 00:31:50 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								2ed685384d
								
							
						 | 
						
							
							
								
								fix: 尾款时间规则
							
							
							
							
							
						 | 
						
							2025-05-02 19:07:35 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								4a1d34e6dc
								
							
						 | 
						
							
							
								
								fix: 修改列表和尾款支付时间限制
							
							
							
							
							
						 | 
						
							2025-05-02 18:58:20 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								8bdaea0ad4
								
							
						 | 
						
							
							
								
								fix: 定金和预售价的判断
							
							
							
							
							
						 | 
						
							2025-04-30 17:59:19 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								adb0cb4f2c
								
							
						 | 
						
							
							
								
								fix: 预售商品时间问题
							
							
							
							
							
						 | 
						
							2025-04-30 17:44:54 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								ee68f341a1
								
							
						 | 
						
							
							
								
								fix: 修改错别字
							
							
							
							
							
						 | 
						
							2025-04-30 17:04:16 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								653ee3355e
								
							
						 | 
						
							
							
								
								fix: 预售商品改造
							
							
							
							
							
						 | 
						
							2025-04-29 00:32:04 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								8ee49aab47
								
							
						 | 
						
							
							
								
								fix: 预售商品模块更新
							
							
							
							
							
						 | 
						
							2025-04-27 21:33:30 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								8cab8c35f1
								
							
						 | 
						
							
							
								
								fix: 修改按钮名称
							
							
							
							
							
						 | 
						
							2025-04-27 17:35:27 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								2777174a60
								
							
						 | 
						
							
							
								
								fix: 包邮条件
							
							
							
							
							
						 | 
						
							2025-04-08 17:48:31 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								6c3008ce2f
								
							
						 | 
						
							
							
								
								fix: 运费模板增加显示包邮条件表格
							
							
							
							
							
						 | 
						
							2025-04-08 17:19:05 +08:00 | 
						
					
				
					
						
							
							
								
								 lzhizhao
							
						 | 
						
							
							
							
							
							
								
							
							
								53beb5271c
								
							
						 | 
						
							
							
								
								fix: 处理高度问题
							
							
							
							
							
						 | 
						
							2025-04-08 10:39:22 +08:00 | 
						
					
				
					
						
							
							
								 
								KangKang0928
							
						 | 
						
							
							
							
							
							
								
							
							
								3c380eccc2
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-03-20 16:53:13 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								effc36a756
								
							
						 | 
						
							
							
								
								运费模版
							
							
							
							
							
						 | 
						
							2025-03-20 10:00:57 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								7317367716
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-03-18 14:54:25 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								482e743ea1
								
							
						 | 
						
							
							
								
								商品预售
							
							
							
							
							
						 | 
						
							2025-03-18 14:54:19 +08:00 | 
						
					
				
					
						
							
							
								
								 yukai
							
						 | 
						
							
							
							
							
							
								
							
							
								c5b73ec1ee
								
							
						 | 
						
							
							
								
								角色权限字段不必填
							
							
							
							
							
						 | 
						
							2025-03-08 14:46:08 +08:00 | 
						
					
				
					
						
							
							
								
								 yukai
							
						 | 
						
							
							
							
							
							
								
							
							
								25502106ec
								
							
						 | 
						
							
							
								
								正式环境地址替换
							
							
							
							
							
						 | 
						
							2025-03-08 14:18:21 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								642b582113
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-03-05 10:22:21 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								5a3c0c415b
								
							
						 | 
						
							
							
								
								统计
							
							
							
							
							
						 | 
						
							2025-03-05 10:22:18 +08:00 | 
						
					
				
					
						
							
							
								 
								KangKang0928
							
						 | 
						
							
							
							
							
							
								
							
							
								38bee145b6
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-03-05 10:07:37 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								6219212dc2
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-03-05 09:49:57 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								52e4eb8130
								
							
						 | 
						
							
							
								
								云店会员
							
							
							
							
							
						 | 
						
							2025-03-05 09:49:54 +08:00 | 
						
					
				
					
						
							
							
								 
								KangKang0928
							
						 | 
						
							
							
							
							
							
								
							
							
								4800980a48
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-02-19 10:07:36 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								09dc3fe8d1
								
							
						 | 
						
							
							
								
								unitType
							
							
							
							
							
						 | 
						
							2025-02-19 10:02:39 +08:00 | 
						
					
				
					
						
							
							
								 
								KangKang0928
							
						 | 
						
							
							
							
							
							
								
							
							
								913ac0d8c3
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-01-24 09:51:30 +08:00 | 
						
					
				
					
						
							
							
								 
								itxiaoyu
							
						 | 
						
							
							
							
							
							
								
							
							
								204ae46d91
								
							
						 | 
						
							
							
								
								积分商城
							
							
							
							
							
						 | 
						
							2025-01-23 11:55:32 +08:00 | 
						
					
				
					
						
							
							
								 
								itxiaoyu
							
						 | 
						
							
							
							
							
							
								
							
							
								5d3a774ff5
								
							
						 | 
						
							
							
								
								预售商品
							
							
							
							
							
						 | 
						
							2025-01-23 02:18:46 +08:00 | 
						
					
				
					
						
							
							
								 
								KangKang0928
							
						 | 
						
							
							
							
							
							
								
							
							
								d0c77a1131
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-01-20 17:44:08 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								e5d8ebe25c
								
							
						 | 
						
							
							
								
								权限管理
							
							
							
							
							
						 | 
						
							2025-01-20 17:42:33 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								22cdb23ac1
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-01-17 18:07:28 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								da5f2073d5
								
							
						 | 
						
							
							
								
								角色
							
							
							
							
							
						 | 
						
							2025-01-17 18:07:25 +08:00 | 
						
					
				
					
						
							
							
								 
								KangKang0928
							
						 | 
						
							
							
							
							
							
								
							
							
								db11371ba0
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
							
							
							
							
							
						 | 
						
							2025-01-15 17:55:30 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								cd9454dae1
								
							
						 | 
						
							
							
								
								代理商和品牌订单
							
							
							
							
							
						 | 
						
							2025-01-15 17:26:36 +08:00 | 
						
					
				
					
						
							
							
								 
								余同学
							
						 | 
						
							
							
							
							
							
								
							
							
								bc5bb0414f
								
							
						 | 
						
							
							
								
								品牌店铺和市场
							
							
							
							
							
						 | 
						
							2025-01-14 18:12:32 +08:00 |