YunaiV
							
						 
					 | 
					
						
						
							
						
						d3b6a0ca69
					 | 
					
						
						
							
							1. 修复 refund/index.vue 的报错
						
						
						
						
						
						
						
						2. 优化 DateUtils 的工具类的方法命名 
						
						
					 | 
					
						2022-11-10 12:55:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						423256c0db
					 | 
					
						
						
							
							fix 滑块验证码error
						
						
						
						
						
						
					 | 
					
						2022-11-10 09:47:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						18e11a56b5
					 | 
					
						
						
							
							回退sass版本
						
						
						
						
						
						
					 | 
					
						2022-11-10 09:27:00 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						941782fb10
					 | 
					
						
						
							
							promotion:完善限时折扣的修改逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-06 12:38:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6d48bd1ed8
					 | 
					
						
						
							
							promotion:完善限时折扣的添加逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-06 00:48:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d4b7f4aaa0
					 | 
					
						
						
							
							promotion:增加限时折扣的基础代码
						
						
						
						
						
						
					 | 
					
						2022-11-05 19:13:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						00f90e75d9
					 | 
					
						
						
							
							promotion:增加满减送活动的关闭功能
						
						
						
						
						
						
					 | 
					
						2022-11-05 10:52:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						74b6ff1eef
					 | 
					
						
						
							
							promotion:增加满减送活动的前端 50%
						
						
						
						
						
						
					 | 
					
						2022-11-05 00:14:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						873b530652
					 | 
					
						
						
							
							promotion:增加优惠劵的回收操作
						
						
						
						
						
						
					 | 
					
						2022-11-04 21:17:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						47c2dfa623
					 | 
					
						
						
							
							promotion:增加优惠劵的前端分页界面 100%
						
						
						
						
						
						
					 | 
					
						2022-11-04 19:17:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						86b6b85934
					 | 
					
						
						
							
							promotion:增加优惠劵的前端分页界面 80%
						
						
						
						
						
						
					 | 
					
						2022-11-04 00:27:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8ae8a4a652
					 | 
					
						
						
							
							promotion:完善优惠劵模板的单元测试、禁用功能
						
						
						
						
						
						
					 | 
					
						2022-11-02 22:44:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e3a700b2d2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-11-02 22:19:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bd661296c0
					 | 
					
						
						
							
							promotion:完善优惠劵模板的功能
						
						
						
						
						
						
					 | 
					
						2022-11-02 22:19:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LAPTOP-CNV4CMCJ\cheng
							
						 
					 | 
					
						
						
							
						
						63cb9eb47e
					 | 
					
						
						
							
							Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-11-02 10:46:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LAPTOP-CNV4CMCJ\cheng
							
						 
					 | 
					
						
						
							
						
						89fefc5f81
					 | 
					
						
						
							
							处理了商品订单的TODO
						
						
						
						
						
						
					 | 
					
						2022-11-02 10:46:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2aaeb7af88
					 | 
					
						
						
							
							promotion:实现部分优惠劵模板的前端表单 80%
						
						
						
						
						
						
					 | 
					
						2022-11-02 00:35:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dc51a93533
					 | 
					
						
						
							
							promotion:实现部分优惠劵模板的前端列表
						
						
						
						
						
						
					 | 
					
						2022-11-01 22:31:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3c10058dbd
					 | 
					
						
						
							
							promotion:实现部分优惠劵模板的前端逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-01 00:37:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						035c2cf28c
					 | 
					
						
						
							
							promotion:完善 优惠劵模板 表~
						
						
						
						
						
						
					 | 
					
						2022-10-31 21:19:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cca27636b7
					 | 
					
						
						
							
							code review 订单列表.vue 界面
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:09:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LAPTOP-CNV4CMCJ\cheng
							
						 
					 | 
					
						
						
							
						
						e035e66ffd
					 | 
					
						
						
							
							Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-10-27 16:49:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LAPTOP-CNV4CMCJ\cheng
							
						 
					 | 
					
						
						
							
						
						dcb3f1c8f0
					 | 
					
						
						
							
							新增订单管理页面
						
						
						
						
						
						
					 | 
					
						2022-10-27 16:49:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						7dd12a3e81
					 | 
					
						
						
							
							Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-10-27 10:30:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e1d5cfe8fe
					 | 
					
						
						
							
							微调 trade 交易表的设计
						
						
						
						
						
						
					 | 
					
						2022-10-26 21:25:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						20c79b7053
					 | 
					
						
						
							
							Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-10-26 14:57:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						356642ecea
					 | 
					
						
						
							
							review 商品的 save 界面
						
						
						
						
						
						
					 | 
					
						2022-10-25 22:13:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						d92d257619
					 | 
					
						
						
							
							Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java 
						
						
					 | 
					
						2022-10-25 11:15:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7bf37fcb64
					 | 
					
						
						
							
							优化管理后台的商品分页的查询
						
						
						
						
						
						
					 | 
					
						2022-10-24 22:12:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c00ded3ed3
					 | 
					
						
						
							
							优化商品的 index 界面
						
						
						
						
						
						
					 | 
					
						2022-10-24 21:27:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						dc4e3fcd6e
					 | 
					
						
						
							
							feature(商城): 商城review改
						
						
						
						
						
						
					 | 
					
						2022-10-24 10:30:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2bd2cb56a1
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml 
						
						
					 | 
					
						2022-10-23 22:16:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3cee922e69
					 | 
					
						
						
							
							优化 permission 相关的注释
						
						
						
						
						
						
					 | 
					
						2022-10-23 20:21:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a13fb61359
					 | 
					
						
						
							
							优化 pom.xml 文件,减少无用的多租户引用
						
						
						
						
						
						
					 | 
					
						2022-10-18 23:32:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						31f5b27d01
					 | 
					
						
						
							
							feature(uniapp分类): review
						
						
						
						
						
						
					 | 
					
						2022-10-17 19:55:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huzhibo
							
						 
					 | 
					
						
						
							
						
						66cef17fa1
					 | 
					
						
						
							
							调整前端配置管理中参数分类显示
						
						
						
						
						
						
						
						Signed-off-by: huzhibo <527188553@qq.com> 
						
						
					 | 
					
						2022-10-13 10:57:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6b79788b5a
					 | 
					
						
						
							
							完善 oauth2.0 的注释
						
						
						
						
						
						
					 | 
					
						2022-10-06 20:00:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						585d2a523b
					 | 
					
						
						
							
							修复登录的 redirect 地址,存在参数时,登录成功回跳的时候地址不正确的问题
						
						
						
						
						
						
					 | 
					
						2022-10-01 21:37:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ff54f16907
					 | 
					
						
						
							
							完成 yudao-sso-demo-by-code 刷新访问令牌
						
						
						
						
						
						
					 | 
					
						2022-10-01 20:49:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhijiantianya@gmail.com
							
						 
					 | 
					
						
						
							
						
						c25791047f
					 | 
					
						
						
							
							mall: 商品的代码 review
						
						
						
						
						
						
					 | 
					
						2022-09-30 08:30:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2b784d180e
					 | 
					
						
						
							
							调整 sso 界面,移除多租户的选择
						
						
						
						
						
						
					 | 
					
						2022-09-29 21:17:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d26c78a0df
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-09-24 12:55:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |