YunaiV
							
						 
					 | 
					
						
						
							
						
						c7a21b2a64
					 | 
					
						
						
							
							mall:优化商品收藏的分页接口
						
						
						
						
						
						
					 | 
					
						2023-11-19 00:58:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						867293a4f9
					 | 
					
						
						
							
							!724 会员中心商品收藏
						
						
						
						
						
						
						
						Merge pull request !724 from niou233/feature/mall_product_org 
						
						
					 | 
					
						2023-11-18 16:40:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a440b354ba
					 | 
					
						
						
							
							!735 商城装修
						
						
						
						
						
						
						
						Merge pull request !735 from 疯狂的世界/feature/mall_product 
						
						
					 | 
					
						2023-11-18 11:25:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						330380c2d0
					 | 
					
						
						
							
							营销:适配商城装修组件【商品卡片】
						
						
						
						
						
						
					 | 
					
						2023-11-17 09:56:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						5a5a42463b
					 | 
					
						
						
							
							refactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 17:22:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						92be763c6f
					 | 
					
						
						
							
							refactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 17:18:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						670c0962a7
					 | 
					
						
						
							
							refactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 17:03:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						cbaadc3a77
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_org
						
						
						
						
						
						
					 | 
					
						2023-11-08 14:39:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						5facac7330
					 | 
					
						
						
							
							refactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 14:37:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						daa7d14b09
					 | 
					
						
						
							
							reafactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 14:36:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						4ae3d34801
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-11-07 23:11:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						15313c2992
					 | 
					
						
						
							
							转账 - 增加转账定时任务
						
						
						
						
						
						
					 | 
					
						2023-11-07 23:11:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						09d45e6393
					 | 
					
						
						
							
							转账 - 增加转账通知
						
						
						
						
						
						
					 | 
					
						2023-11-06 11:33:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						989d7c44d0
					 | 
					
						
						
							
							code review 店铺装修
						
						
						
						
						
						
					 | 
					
						2023-11-04 22:52:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1eff9822ce
					 | 
					
						
						
							
							同步最新 master 代码
						
						
						
						
						
						
					 | 
					
						2023-11-04 20:52:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						787de1be94
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java 
						
						
					 | 
					
						2023-11-04 20:48:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f9e64a9f0a
					 | 
					
						
						
							
							同步最新 SQL
						
						
						
						
						
						
					 | 
					
						2023-11-04 20:43:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						87bc3f510c
					 | 
					
						
						
							
							优化:社交登录、用户的管理
						
						
						
						
						
						
					 | 
					
						2023-11-04 14:37:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e9317bf293
					 | 
					
						
						
							
							Merge branch 'feature/mall_product_tmp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java 
						
						
					 | 
					
						2023-11-04 12:03:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						01641cd1be
					 | 
					
						
						
							
							!696 新增社交客户端 CRUD,新增社交用户 RUD
						
						
						
						
						
						
						
						Merge pull request !696 from puhui999/feature/mall_product_tmp 
						
						
					 | 
					
						2023-11-04 04:00:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						20b11092c2
					 | 
					
						
						
							
							!712 商城装修
						
						
						
						
						
						
						
						Merge pull request !712 from 疯狂的世界/feature/mall_product 
						
						
					 | 
					
						2023-11-03 11:04:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						bdfb5b8894
					 | 
					
						
						
							
							营销:装修页面适配
						
						
						
						
						
						
					 | 
					
						2023-11-03 09:18:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						cf114409b0
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-11-03 08:43:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						f4d600398c
					 | 
					
						
						
							
							转账 - 管理后台增加转账单查询
						
						
						
						
						
						
					 | 
					
						2023-11-03 08:43:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						9996608da6
					 | 
					
						
						
							
							营销:装修模板APP接口
						
						
						
						
						
						
					 | 
					
						2023-11-03 06:38:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						497d826ac4
					 | 
					
						
						
							
							!711 增加 RocketMQ、Kafka、RabbitMQ 消息队列的支持
						
						
						
						
						
						
						
						Merge pull request !711 from 芋道源码/feature/mq-optimize 
						
						
					 | 
					
						2023-11-02 12:53:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c886e7eff2
					 | 
					
						
						
							
							mq:增加 Rabbitmq 教程内容
						
						
						
						
						
						
					 | 
					
						2023-11-02 20:18:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						456b0c8ddd
					 | 
					
						
						
							
							mq:增加 kafka 配置项
						
						
						
						
						
						
					 | 
					
						2023-11-02 12:25:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						20725e3dfd
					 | 
					
						
						
							
							mq:增加 rabbitmq 配置项
						
						
						
						
						
						
					 | 
					
						2023-11-02 08:22:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b8d5a665be
					 | 
					
						
						
							
							mq:增加 rocketmq 配置项
						
						
						
						
						
						
					 | 
					
						2023-11-02 00:07:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e1c34e9124
					 | 
					
						
						
							
							mq:优化 redis stream 的命名
						
						
						
						
						
						
					 | 
					
						2023-11-01 22:46:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhijiantianya@gmail.com
							
						 
					 | 
					
						
						
							
						
						f8ed0e15f0
					 | 
					
						
						
							
							mq:增加 kafka、rocketmq、rabbitmq 的实现支持
						
						
						
						
						
						
					 | 
					
						2023-11-01 19:58:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						bee4b761ec
					 | 
					
						
						
							
							!709 营销:完善商城装修
						
						
						
						
						
						
						
						Merge pull request !709 from 疯狂的世界/feature/mall_product 
						
						
					 | 
					
						2023-11-01 00:47:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dongshanshan
							
						 
					 | 
					
						
						
							
						
						98aae5ed1a
					 | 
					
						
						
							
							feat: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-10-31 16:51:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						32499be98f
					 | 
					
						
						
							
							营销:完善商城装修
						
						
						
						
						
						
						
						1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断 
						
						
					 | 
					
						2023-10-31 16:01:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c066ea46f9
					 | 
					
						
						
							
							mq 重构:默认的 redis 实现:
						
						
						
						
						
						
						
						1)默认 channel 和 stream key
2)移除 enabled 开关,通过 listener 是否存在来实现
3)调整包名,为接入 rocketmq 作为 mq 实现做准备 
						
						
					 | 
					
						2023-10-30 21:15:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						df8a81f658
					 | 
					
						
						
							
							!705 修复 vben 代码生成错误
						
						
						
						
						
						
						
						Merge pull request !705 from xingyu/fix/vben_codegen 
						
						
					 | 
					
						2023-10-30 12:08:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						7767a8f837
					 | 
					
						
						
							
							chore: up mybatis-plus-join 1.4.7
						
						
						
						
						
						
					 | 
					
						2023-10-30 18:17:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						5bfb8098d6
					 | 
					
						
						
							
							fix: vben codegen
						
						
						
						
						
						
					 | 
					
						2023-10-30 18:15:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d048daf7d6
					 | 
					
						
						
							
							mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖
						
						
						
						
						
						
					 | 
					
						2023-10-30 12:53:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						48b1c19f28
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-10-29 23:36:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						ccccd9f226
					 | 
					
						
						
							
							转账 - 转账代码修改,新增转账示例
						
						
						
						
						
						
					 | 
					
						2023-10-29 23:36:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1d3ef770a0
					 | 
					
						
						
							
							!703 商城装修
						
						
						
						
						
						
						
						Merge pull request !703 from 疯狂的世界/feature/mall_diy 
						
						
					 | 
					
						2023-10-29 14:15:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						b5f9ed9edf
					 | 
					
						
						
							
							营销:装修SQL调整
						
						
						
						
						
						
					 | 
					
						2023-10-29 22:04:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						87fb47ca6a
					 | 
					
						
						
							
							!698 fix: 修复PayWalletRechargeCerate参数校验
						
						
						
						
						
						
						
						Merge pull request !698 from JaysonAlbert/fix/validate-pay-wallet 
						
						
					 | 
					
						2023-10-29 13:07:18 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						c637a172ec
					 | 
					
						
						
							
							营销:装修代码整理
						
						
						
						
						
						
					 | 
					
						2023-10-29 18:50:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jayson Albert
							
						 
					 | 
					
						
						
							
						
						f4ea648ac9
					 | 
					
						
						
							
							fix: 修复PayWalletRechargeCerate参数校验
						
						
						
						
						
						
					 | 
					
						2023-10-28 19:45:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						3a2ccc9d6b
					 | 
					
						
						
							
							营销:装修模板、装修页面
						
						
						
						
						
						
					 | 
					
						2023-10-27 14:58:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						8552e86d8a
					 | 
					
						
						
							
							完善三方登录
						
						
						
						
						
						
					 | 
					
						2023-10-26 17:03:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						5f29399cf4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-10-25 23:42:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |