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
							
						 
					 | 
					
						
						
							
						
						a9ae7b0865
					 | 
					
						
						
							
							✅ 完善 UReport2 的集成
						
						
						
						
						
						
					 | 
					
						2023-12-07 07:37:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						076bf13687
					 | 
					
						
						
							
							📈 REPORT:code review ureport2 实现
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						0d3efe4f80
					 | 
					
						
						
							
							【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5e9cbb9cad
					 | 
					
						
						
							
							report:code review ureport 的集成
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						5894d2be01
					 | 
					
						
						
							
							【修改】ureport2 集成的SQL语句,并适配数据库存储方式
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						8507fa9172
					 | 
					
						
						
							
							【新增】ureport2 集成
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9451287264
					 | 
					
						
						
							
							✨ CRM:同步最新功能,基本跑通客户信息的维护
						
						
						
						
						
						
					 | 
					
						2023-12-06 20:28:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c94f71a3df
					 | 
					
						
						
							
							🔨 CRM:优化产品分类代码的实现
						
						
						
						
						
						
					 | 
					
						2023-12-06 12:56:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						7724d6e830
					 | 
					
						
						
							
							!765 Vue2 + Element UI 代码生成器
						
						
						
						
						
						
						
						Merge pull request !765 from 芋道源码/feature/sub-table 
						
						
					 | 
					
						2023-11-28 12:28:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6d228828f4
					 | 
					
						
						
							
							application-local.yaml 恢复
						
						
						
						
						
						
					 | 
					
						2023-11-27 16:34:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0233b092b8
					 | 
					
						
						
							
							websocket:重新封装 websocket 组件,支持 sender 广播
						
						
						
						
						
						
					 | 
					
						2023-11-24 00:32:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1941a7b3e6
					 | 
					
						
						
							
							websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息
						
						
						
						
						
						
					 | 
					
						2023-11-22 23:17:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						827897807f
					 | 
					
						
						
							
							提升启动速度
						
						
						
						
						
						
					 | 
					
						2023-11-19 18:46:16 +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
							
						 
					 | 
					
						
						
							
						
						6270975902
					 | 
					
						
						
							
							优化启动速度
						
						
						
						
						
						
					 | 
					
						2023-11-19 00:37:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5122aee924
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
						
						
						
						
						
						
						
						# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/views/system/user/index.vue 
						
						
					 | 
					
						2023-11-18 20:44:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						df69fecbb4
					 | 
					
						
						
							
							代码生成:重构 vue2 模版,适配树表和主子表(80%)
						
						
						
						
						
						
					 | 
					
						2023-11-17 17:03:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						feba904fd8
					 | 
					
						
						
							
							多租户:登录界面,根据 host 域名获取对应的租户编号
						
						
						
						
						
						
					 | 
					
						2023-11-06 19:47:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c162b39e1e
					 | 
					
						
						
							
							多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突
						
						
						
						
						
						
					 | 
					
						2023-11-06 19:04:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						989d7c44d0
					 | 
					
						
						
							
							code review 店铺装修
						
						
						
						
						
						
					 | 
					
						2023-11-04 22:52:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5bb91f139e
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
						
						
						
						
						
						
					 | 
					
						2023-11-03 23:34:37 +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
							
						 
					 | 
					
						
						
							
						
						c066ea46f9
					 | 
					
						
						
							
							mq 重构:默认的 redis 实现:
						
						
						
						
						
						
						
						1)默认 channel 和 stream key
2)移除 enabled 开关,通过 listener 是否存在来实现
3)调整包名,为接入 rocketmq 作为 mq 实现做准备 
						
						
					 | 
					
						2023-10-30 21:15:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0657c357bf
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
						
						
						
						
						
						
					 | 
					
						2023-10-29 14:25:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c11300d33a
					 | 
					
						
						
							
							解决启动问题
						
						
						
						
						
						
					 | 
					
						2023-10-24 19:54:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dd2f5ba2c3
					 | 
					
						
						
							
							统一 boot 和 cloud 代码
						
						
						
						
						
						
					 | 
					
						2023-10-24 18:48:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc2d30cfaf
					 | 
					
						
						
							
							pay:修复单元测试报错
						
						
						
						
						
						
					 | 
					
						2023-10-24 08:09:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						94c2ad5d1d
					 | 
					
						
						
							
							修复报错的单元测试
						
						
						
						
						
						
					 | 
					
						2023-10-22 08:55:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						785fbeeb5b
					 | 
					
						
						
							
							code review:限时折扣活动
						
						
						
						
						
						
					 | 
					
						2023-10-21 18:16:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						90fb2c62b8
					 | 
					
						
						
							
							!683 mall模块
						
						
						
						
						
						
						
						Merge pull request !683 from zxiaoxiu/discount 
						
						
					 | 
					
						2023-10-21 09:23:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7e312aae02
					 | 
					
						
						
							
							初始化 crm 模块
						
						
						
						
						
						
					 | 
					
						2023-10-15 20:16:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b009f0b058
					 | 
					
						
						
							
							application-local.yaml 恢复
						
						
						
						
						
						
					 | 
					
						2023-10-15 16:43:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						55eed1377a
					 | 
					
						
						
							
							营销活动: 新增文章管理
						
						
						
						
						
						
					 | 
					
						2023-10-15 16:16:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b30754a0a4
					 | 
					
						
						
							
							同步最新 mall 代码
						
						
						
						
						
						
					 | 
					
						2023-10-12 21:58:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						df16278a03
					 | 
					
						
						
							
							统计:会员统计
						
						
						
						
						
						
					 | 
					
						2023-10-09 23:27:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ac55a9657c
					 | 
					
						
						
							
							promotion:完善秒杀模块
						
						
						
						
						
						
					 | 
					
						2023-10-03 18:41:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c66b4e7bc0
					 | 
					
						
						
							
							code review:日志清理 Job
						
						
						
						
						
						
					 | 
					
						2023-10-03 11:02:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1bc1be14fb
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2023-10-03 10:33:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1f910992d6
					 | 
					
						
						
							
							trade:新增是否自提的配置项
						
						
						
						
						
						
					 | 
					
						2023-10-02 21:18:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								j-sentinel
							
						 
					 | 
					
						
						
							
						
						2f0483ce9f
					 | 
					
						
						
							
							[新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
						
						
						
						
						
						
					 | 
					
						2023-10-02 19:18:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								j-sentinel
							
						 
					 | 
					
						
						
							
						
						11921fab5a
					 | 
					
						
						
							
							[新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
						
						
						
						
						
						
					 | 
					
						2023-10-01 16:53:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						929ff4286a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-09-29 21:08:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						171161e6c7
					 | 
					
						
						
							
							统计:交易统计
						
						
						
						
						
						
					 | 
					
						2023-09-29 21:08:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						666ba351a2
					 | 
					
						
						
							
							trade:退款理由的维护
						
						
						
						
						
						
					 | 
					
						2023-09-29 13:35:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f9bf41d773
					 | 
					
						
						
							
							code review:分佣剩余部分的 review
						
						
						
						
						
						
					 | 
					
						2023-09-28 22:22:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |