xingyu4j
							
						 
					 | 
					
						
						
							
						
						7922e90135
					 | 
					
						
						
							
							fix: vxe size
						
						
						
						
						
						
					 | 
					
						2022-11-10 13:15:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						55405afe94
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-11-10 13:01:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						095c0c1941
					 | 
					
						
						
							
							!292 refactor: Date ==> LocalDateTime && fix vue2 bugs
						
						
						
						
						
						
						
						Merge pull request !292 from xingyu/dev 
						
						
					 | 
					
						2022-11-10 04:58:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d3b6a0ca69
					 | 
					
						
						
							
							1. 修复 refund/index.vue 的报错
						
						
						
						
						
						
						
						2. 优化 DateUtils 的工具类的方法命名 
						
						
					 | 
					
						2022-11-10 12:55:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						33e887c07d
					 | 
					
						
						
							
							chore: update devs
						
						
						
						
						
						
					 | 
					
						2022-11-10 10:09:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						423256c0db
					 | 
					
						
						
							
							fix 滑块验证码error
						
						
						
						
						
						
					 | 
					
						2022-11-10 09:47:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						edb88a398e
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-11-10 09:27:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5934d6b029
					 | 
					
						
						
							
							trade:完成下单时,创建支付单逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-10 09:27:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						18e11a56b5
					 | 
					
						
						
							
							回退sass版本
						
						
						
						
						
						
					 | 
					
						2022-11-10 09:27:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						84f6ec10bc
					 | 
					
						
						
							
							trade:增加优惠劵使用、商品库存的扣减
						
						
						
						
						
						
					 | 
					
						2022-11-10 00:32:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						16f5d0f5a4
					 | 
					
						
						
							
							trade:增加优惠劵使用、商品库存的扣减
						
						
						
						
						
						
					 | 
					
						2022-11-09 23:56:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						7961c8fa95
					 | 
					
						
						
							
							fix: button
						
						
						
						
						
						
					 | 
					
						2022-11-09 19:41:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						c701cc92c3
					 | 
					
						
						
							
							perf: add xtextbutton
						
						
						
						
						
						
					 | 
					
						2022-11-09 16:32:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						83592ad069
					 | 
					
						
						
							
							chore: update devs
						
						
						
						
						
						
					 | 
					
						2022-11-09 16:31:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						b8665a9bc6
					 | 
					
						
						
							
							perf: add xtextbutton
						
						
						
						
						
						
					 | 
					
						2022-11-09 16:31:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						734236df97
					 | 
					
						
						
							
							trade:创建订单接口的后端实现的单元测试 100%
						
						
						
						
						
						
					 | 
					
						2022-11-09 13:03:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						9c033d0104
					 | 
					
						
						
							
							DateUtils ==> LocalDateTime
						
						
						
						
						
						
					 | 
					
						2022-11-09 12:43:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						cb006ddf2b
					 | 
					
						
						
							
							DateUtils.buildLocalDateTime ==> LocalDateTime.of
						
						
						
						
						
						
					 | 
					
						2022-11-09 12:38:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						375229111e
					 | 
					
						
						
							
							docs: update devs
						
						
						
						
						
						
					 | 
					
						2022-11-09 11:39:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						9358816ad4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev
						
						
						
						
						
						
					 | 
					
						2022-11-09 11:15:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						632a132a6a
					 | 
					
						
						
							
							refactor: Date ==> LocalDateTime
						
						
						
						
						
						
					 | 
					
						2022-11-09 11:14:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bc2aa78f70
					 | 
					
						
						
							
							trade:创建订单接口的后端实现的单元测试 50%
						
						
						
						
						
						
					 | 
					
						2022-11-09 01:03:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						bef3511c6e
					 | 
					
						
						
							
							!291 升级 vue2 && 完善 vue3 vxe demo
						
						
						
						
						
						
						
						Merge pull request !291 from xingyu/dev 
						
						
					 | 
					
						2022-11-08 14:51:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						01d10b518c
					 | 
					
						
						
							
							trade:优化创建订单接口的后端实现
						
						
						
						
						
						
					 | 
					
						2022-11-08 22:50:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d7a1c8f7ca
					 | 
					
						
						
							
							promotion:增加获得优惠劵匹配结果的列表的单元测试
						
						
						
						
						
						
					 | 
					
						2022-11-08 19:32:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						2c1419fb1a
					 | 
					
						
						
							
							vue3 代码生成
						
						
						
						
						
						
					 | 
					
						2022-11-08 13:59:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						6f1f8d8eaa
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev
						
						
						
						
						
						
					 | 
					
						2022-11-08 13:45:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						0f40947721
					 | 
					
						
						
							
							升级部分依赖
						
						
						
						
						
						
					 | 
					
						2022-11-08 13:43:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						011dc23699
					 | 
					
						
						
							
							替换var 为const/let
						
						
						
						
						
						
						
						删除未使用import
替换 == 为 === 
						
						
					 | 
					
						2022-11-08 13:31:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						c9e11e7636
					 | 
					
						
						
							
							fix slot-scope
						
						
						
						
						
						
					 | 
					
						2022-11-08 12:54:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						d730c50dee
					 | 
					
						
						
							
							修复代码警告
						
						
						
						
						
						
					 | 
					
						2022-11-08 12:26:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						fd30368628
					 | 
					
						
						
							
							update vue 2.7.0
						
						
						
						
						
						
					 | 
					
						2022-11-08 12:23:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						3fa8e69af0
					 | 
					
						
						
							
							update element-ui 2.15.10
						
						
						
						
						
						
					 | 
					
						2022-11-08 11:13:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						3a7f309866
					 | 
					
						
						
							
							fix: error
						
						
						
						
						
						
					 | 
					
						2022-11-08 10:33:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						84cb1bd4db
					 | 
					
						
						
							
							chore: update 184
						
						
						
						
						
						
					 | 
					
						2022-11-08 09:42:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						edc5d0f1d0
					 | 
					
						
						
							
							promotion:增加获得优惠劵匹配结果的列表
						
						
						
						
						
						
					 | 
					
						2022-11-08 00:40:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LAPTOP-CNV4CMCJ\cheng
							
						 
					 | 
					
						
						
							
						
						fb45f22533
					 | 
					
						
						
							
							Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-11-08 00:16:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LAPTOP-CNV4CMCJ\cheng
							
						 
					 | 
					
						
						
							
						
						ea5e6b2c0e
					 | 
					
						
						
							
							新增了订单详情
						
						
						
						
						
						
					 | 
					
						2022-11-08 00:16:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						dc84ebde9d
					 | 
					
						
						
							
							perf: vxe demo
						
						
						
						
						
						
					 | 
					
						2022-11-07 18:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						1a45526a9d
					 | 
					
						
						
							
							fix: page loading
						
						
						
						
						
						
					 | 
					
						2022-11-07 15:10:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						efb4cf0c66
					 | 
					
						
						
							
							fix: print Params
						
						
						
						
						
						
					 | 
					
						2022-11-07 14:58:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						4bc7645850
					 | 
					
						
						
							
							feat: vxe 全局滚动条样式
						
						
						
						
						
						
					 | 
					
						2022-11-07 14:39:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						b1d0fe7599
					 | 
					
						
						
							
							style: post button
						
						
						
						
						
						
					 | 
					
						2022-11-07 14:12:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						111488e5d6
					 | 
					
						
						
							
							refactor: codegen
						
						
						
						
						
						
					 | 
					
						2022-11-07 14:02:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						cb6a9a1282
					 | 
					
						
						
							
							!288 修复vue3 部分bug 重构axios 完善vxe demo
						
						
						
						
						
						
						
						Merge pull request !288 from xingyu/dev 
						
						
					 | 
					
						2022-11-07 05:35:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						4b7e7d61f7
					 | 
					
						
						
							
							fix: bugs
						
						
						
						
						
						
					 | 
					
						2022-11-07 13:25:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						77067a11bb
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-11-07 09:39:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						05614cc0b8
					 | 
					
						
						
							
							trade:完善 TradeOrderItemDO 字段
						
						
						
						
						
						
					 | 
					
						2022-11-06 23:55:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d10f49b6a7
					 | 
					
						
						
							
							promotion:优化价格计算的接口,增加 orderPrice 字段
						
						
						
						
						
						
					 | 
					
						2022-11-06 22:25:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						636cc794dd
					 | 
					
						
						
							
							promotion:完善价格计算,重新接入限时折扣的多种优惠方式
						
						
						
						
						
						
					 | 
					
						2022-11-06 18:41:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |