brook
							
						 
					 | 
					
						
						
							
						
						fd42e1711d
					 | 
					
						
						
							
							fix: insertOrUpdate死循环问题
						
						
						
						
						
						
					 | 
					
						2024-08-09 11:31:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						743383faf2
					 | 
					
						
						
							
							【代码修复】全局:BaseMapperX 的分页 pageSize 不分页判断不对的问题
						
						
						
						
						
						
					 | 
					
						2024-07-21 18:03:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2b39b434fa
					 | 
					
						
						
							
							【依赖】mybatis-plus from 3.5.5 to 3.5.7
						
						
						
						
						
						
					 | 
					
						2024-07-13 22:42:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5ed040943
					 | 
					
						
						
							
							【代码优化】全局:数据库 findInSet 兼容
						
						
						
						
						
						
					 | 
					
						2024-07-07 09:31:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						cc73fc8a91
					 | 
					
						
						
							
							fix: 调整 DbTypeEnum 字段顺序
						
						
						
						
						
						
					 | 
					
						2024-06-23 14:59:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						3c5309b14e
					 | 
					
						
						
							
							feat: FindInSetEnum、NameToTypeEnum 融合为DbTypeEnum
						
						
						
						
						
						
					 | 
					
						2024-06-22 16:56:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						355e47c371
					 | 
					
						
						
							
							【代码评审】Framework:find in set 代码
						
						
						
						
						
						
					 | 
					
						2024-06-22 10:52:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						d49db8eaa8
					 | 
					
						
						
							
							feat: find_in_set函数的跨数据库实现
						
						
						
						
						
						
					 | 
					
						2024-06-18 16:59:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						ba40c1f699
					 | 
					
						
						
							
							fix: 改用kingbase8官方驱动,jdbc-url
						
						
						
						
						
						
					 | 
					
						2024-06-06 23:30:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						0ae11e0eb8
					 | 
					
						
						
							
							fix: JdbcUtils.getDbType 使用MyBatis-Plus工具
						
						
						
						
						
						
					 | 
					
						2024-06-06 23:28:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						a5081b94f5
					 | 
					
						
						
							
							feat: 华为opengauss支持
						
						
						
						
						
						
					 | 
					
						2024-06-05 23:05:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ffac294fbd
					 | 
					
						
						
							
							【优化】全局:兼容 MyBatis Plus 针对 SQL Server 的 saveBatch 不兼容的兼容
						
						
						
						
						
						
					 | 
					
						2024-05-03 22:11:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						290a981cae
					 | 
					
						
						
							
							【修复】全局:移除 Druid 广告逻辑未按照期望执行
						
						
						
						
						
						
					 | 
					
						2024-05-03 10:38:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cd5e6319d9
					 | 
					
						
						
							
							【增强】一键改包:支持 site、org 等包
						
						
						
						
						
						
					 | 
					
						2024-04-29 00:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						beea186507
					 | 
					
						
						
							
							全局:增加 VO 数据翻译的支持
						
						
						
						
						
						
					 | 
					
						2024-04-01 12:42:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						722223c659
					 | 
					
						
						
							
							Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java 
						
						
					 | 
					
						2024-01-27 16:44:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						16fd1a9639
					 | 
					
						
						
							
							🐛 oracle limit 查询不正确
						
						
						
						
						
						
					 | 
					
						2024-01-20 18:46:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fcef0f7f50
					 | 
					
						
						
							
							✨ 升级最新依赖
						
						
						
						
						
						
					 | 
					
						2024-01-19 22:40:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bbba83ef61
					 | 
					
						
						
							
							📖 MALL:code review 商品统计的代码
						
						
						
						
						
						
					 | 
					
						2024-01-07 16:23:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						eb048532f7
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java 
						
						
					 | 
					
						2024-01-06 21:52:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						290f45dd6e
					 | 
					
						
						
							
							Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2023-12-30 20:11:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						829965e50a
					 | 
					
						
						
							
							🐛 fix(websocket): 修复 websocket 失效的问题
						
						
						
						
						
						
					 | 
					
						2023-12-29 12:54:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						08ff391f78
					 | 
					
						
						
							
							🐛 Websocket 断开时,未删除会话缓存 bug
						
						
						
						
						
						
					 | 
					
						2023-12-29 12:48:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						4a007f0c98
					 | 
					
						
						
							
							统计:增加商品统计
						
						
						
						
						
						
					 | 
					
						2023-12-16 23:48:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						23df8633f4
					 | 
					
						
						
							
							📖 CRM:code review 数据权限的实现
						
						
						
						
						
						
					 | 
					
						2023-12-09 10:50:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						5c395fc1c4
					 | 
					
						
						
							
							CRM: 完善 code review 数据权限提到的问题,重新封装 CrmQueryWrapperUtils
						
						
						
						
						
						
					 | 
					
						2023-12-08 15:27:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						98697ee075
					 | 
					
						
						
							
							⬆️
						
						
						
						
						
						
					 | 
					
						2023-12-07 20:48:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						30fef09eee
					 | 
					
						
						
							
							🔧 简化 errorLog 和 accessLog 模块的 VO
						
						
						
						
						
						
					 | 
					
						2023-12-03 18:32:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e40c0e3057
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
						
						# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java 
						
						
					 | 
					
						2023-11-19 18:39:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c7a21b2a64
					 | 
					
						
						
							
							mall:优化商品收藏的分页接口
						
						
						
						
						
						
					 | 
					
						2023-11-19 00:58:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhijiantianya@gmail.com
							
						 
					 | 
					
						
						
							
						
						7e6b084f77
					 | 
					
						
						
							
							Merge branch 'feature/vo-optimize' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table
						
						
						
						
						
						
					 | 
					
						2023-11-15 21:02:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ddb5bce0a2
					 | 
					
						
						
							
							vo 简化:post 重构
						
						
						
						
						
						
					 | 
					
						2023-11-14 22:37:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						06649624e5
					 | 
					
						
						
							
							代码生成:支持设置主子表的信息
						
						
						
						
						
						
					 | 
					
						2023-11-14 12:57:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						256c560d43
					 | 
					
						
						
							
							代码生成:增加主子表的示例
						
						
						
						
						
						
					 | 
					
						2023-11-12 22:33:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						01b62a9b0c
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table
						
						
						
						
						
						
					 | 
					
						2023-11-08 22:29:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhijiantianya@gmail.com
							
						 
					 | 
					
						
						
							
						
						2f6456e2b0
					 | 
					
						
						
							
							代码生成器:主子表,支持多个从字段 50%
						
						
						
						
						
						
					 | 
					
						2023-11-08 21:00:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						daa7d14b09
					 | 
					
						
						
							
							reafactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 14:36:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2afc2caf1d
					 | 
					
						
						
							
							代码生成:主子表的部分实现
						
						
						
						
						
						
					 | 
					
						2023-11-08 09:42:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9762a2a7c3
					 | 
					
						
						
							
							优化:默认只引入 mysql driver,减少打包大小
						
						
						
						
						
						
					 | 
					
						2023-11-06 21:17:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c162b39e1e
					 | 
					
						
						
							
							多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突
						
						
						
						
						
						
					 | 
					
						2023-11-06 19:04:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dongshanshan
							
						 
					 | 
					
						
						
							
						
						98aae5ed1a
					 | 
					
						
						
							
							feat: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-10-31 16:51:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						0612a13cce
					 | 
					
						
						
							
							交易:核销订单
						
						
						
						
						
						
					 | 
					
						2023-10-17 23:18:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c8f1269d6e
					 | 
					
						
						
							
							promotion:修复砍价活动返回的 combinationPrice 为空的问题
						
						
						
						
						
						
					 | 
					
						2023-10-06 22:29:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1bda3c8b53
					 | 
					
						
						
							
							promotion:完善砍价 API ~ 提交下,准备出门吃饭!!!!
						
						
						
						
						
						
					 | 
					
						2023-10-05 17:22:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8b50cd9661
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java 
						
						
					 | 
					
						2023-09-11 16:19:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a5e33f6d3a
					 | 
					
						
						
							
							引入 mybatis plus join 作为基类
						
						
						
						
						
						
					 | 
					
						2023-09-09 14:56:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5808f77ade
					 | 
					
						
						
							
							code review:订单分佣
						
						
						
						
						
						
					 | 
					
						2023-09-08 00:29:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7d99c6dbe8
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
						
						
						
						
						
						
					 | 
					
						2023-08-27 10:52:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						544e650e15
					 | 
					
						
						
							
							Merge pull request #326 from Lemon-cc-hang/base
						
						
						
						
						
						
						
						fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常 
						
						
					 | 
					
						2023-08-27 10:52:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						acee734554
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
						
						
						
						
						
						
					 | 
					
						2023-08-27 10:44:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |