cherishsince
							
						 
					 | 
					
						
						
							
						
						8e7fc1ff96
					 | 
					
						
						
							
							【优化】数据库增加 mjNonce 更新,生成好、或异常的图片信息
						
						
						
						
						
						
					 | 
					
						2024-05-10 15:29:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						16a47bde5b
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21-ai
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2024-05-08 09:12:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						52c86cd290
					 | 
					
						
						
							
							【优化】CRM:员工业绩统计的实现
						
						
						
						
						
						
					 | 
					
						2024-05-07 23:08:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						5579620140
					 | 
					
						
						
							
							【优化】聊天 event stream 改为 flex 返回更加的优雅
						
						
						
						
						
						
					 | 
					
						2024-05-07 17:22:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						213a6aa0fc
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2024-05-04 09:15:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						774082509b
					 | 
					
						
						
							
							feat: 达梦DM8
						
						
						
						
						
						
					 | 
					
						2024-05-03 23:22:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						29746d1459
					 | 
					
						
						
							
							【修复】MySQL jdbc 连接 5.7 示例不正确
						
						
						
						
						
						
					 | 
					
						2024-05-03 09:04:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6ba73e60f0
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
						
						
						
						
						
						
					 | 
					
						2024-05-02 18:16:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						fd8889e76a
					 | 
					
						
						
							
							wip: SQLServer数据库更新, 代码生成注释乱码
						
						
						
						
						
						
					 | 
					
						2024-05-02 15:30:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ab00986a1d
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
						
						
						
						
						
						
					 | 
					
						2024-05-01 08:37:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c0722b3a19
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
						
						
						
						
						
						
						
						# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql 
						
						
					 | 
					
						2024-05-01 08:05:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						06dacb747b
					 | 
					
						
						
							
							feat: Oracle数据 DDL 适配
						
						
						
						
						
						
					 | 
					
						2024-04-30 23:41:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						4f3aaa124c
					 | 
					
						
						
							
							feat: 测试数据库docker-compose, postgres DDL初稿
						
						
						
						
						
						
					 | 
					
						2024-04-29 23:41:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						cf3c145867
					 | 
					
						
						
							
							【增加】提价 midjourney 配置
						
						
						
						
						
						
					 | 
					
						2024-04-29 14:54:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						d14c13b2fc
					 | 
					
						
						
							
							【增加】midjourney 自动配置。
						
						
						
						
						
						
					 | 
					
						2024-04-29 10:59:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cd5e6319d9
					 | 
					
						
						
							
							【增强】一键改包:支持 site、org 等包
						
						
						
						
						
						
					 | 
					
						2024-04-29 00:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						ad46eb57a5
					 | 
					
						
						
							
							【增加】增加open ai dall_e_2 配置
						
						
						
						
						
						
					 | 
					
						2024-04-28 16:40:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						d37c1c4ecc
					 | 
					
						
						
							
							【优化】配置文件统一增加 max-tokens配置 和 topP topK 配置
						
						
						
						
						
						
					 | 
					
						2024-04-27 18:31:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						63c5f90596
					 | 
					
						
						
							
							【优化】兼容阿里云千问开源模型,和付费模型
						
						
						
						
						
						
					 | 
					
						2024-04-27 16:51:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						2adb5accc4
					 | 
					
						
						
							
							【优化】ai chat client自动配置和初始化。
						
						
						
						
						
						
					 | 
					
						2024-04-25 18:05:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						da5425da2f
					 | 
					
						
						
							
							【修复】pay:PayWalletServiceImpl 可能存在的循环依赖问题
						
						
						
						
						
						
						
						【修复】system:dev 配置文件,缺少 WECHAT_MINI_APP 配置项~ 
						
						
					 | 
					
						2024-04-24 12:53:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fd832e23fd
					 | 
					
						
						
							
							bugfix:非 json 请求(文件上传)时,token 过期时,错误读取 request body 问题
						
						
						
						
						
						
					 | 
					
						2024-04-22 23:31:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9a31613e5b
					 | 
					
						
						
							
							【移除】敏感词的管理,简化项目的复杂度
						
						
						
						
						
						
					 | 
					
						2024-04-22 19:53:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8093ef3b96
					 | 
					
						
						
							
							【移除】错误码的管理,简化项目的复杂度
						
						
						
						
						
						
					 | 
					
						2024-04-22 19:42:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						27bfb0d25d
					 | 
					
						
						
							
							关闭租户
						
						
						
						
						
						
					 | 
					
						2024-04-18 17:37:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						7c8ec404db
					 | 
					
						
						
							
							优化,增加模型版本号
						
						
						
						
						
						
					 | 
					
						2024-04-14 17:31:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						ac0de5d485
					 | 
					
						
						
							
							优化自动注入,可以创建多个 client
						
						
						
						
						
						
					 | 
					
						2024-04-13 18:23:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						17f7970259
					 | 
					
						
						
							
							增加自动配置
						
						
						
						
						
						
					 | 
					
						2024-04-13 18:23:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						62c6c4b9bd
					 | 
					
						
						
							
							同步 develop 最新代码
						
						
						
						
						
						
					 | 
					
						2024-04-12 19:17:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9cba258d8f
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
						
						
						
						
						
						
					 | 
					
						2024-04-12 19:14:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2e03dcba69
					 | 
					
						
						
							
							移除 resilience4j 组件
						
						
						
						
						
						
					 | 
					
						2024-04-10 20:57:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9b9f54bb03
					 | 
					
						
						
							
							Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java 
						
						
					 | 
					
						2024-04-05 13:32:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						beea186507
					 | 
					
						
						
							
							全局:增加 VO 数据翻译的支持
						
						
						
						
						
						
					 | 
					
						2024-04-01 12:42:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dcf6cc293e
					 | 
					
						
						
							
							BPM:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差
						
						
						
						
						
						
					 | 
					
						2024-03-30 20:44:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3b379d8cc0
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java 
						
						
					 | 
					
						2024-03-30 11:54:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						907f3a58ba
					 | 
					
						
						
							
							Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql 
						
						
					 | 
					
						2024-03-28 18:53:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ce013a2562
					 | 
					
						
						
							
							CRM: 新增客户行业、来源、级别统计数据统计
						
						
						
						
						
						
					 | 
					
						2024-03-24 17:15:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cc27652f86
					 | 
					
						
						
							
							最新菜单 SQL 的同步
						
						
						
						
						
						
					 | 
					
						2024-03-24 10:43:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e5444c5d47
					 | 
					
						
						
							
							BPM:优化 convert 的逻辑
						
						
						
						
						
						
					 | 
					
						2024-03-20 21:32:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						797fddfb3d
					 | 
					
						
						
							
							BPM:新增 flowable expression 表达式,替代现有 BpmTaskAssignScript,更加灵活
						
						
						
						
						
						
					 | 
					
						2024-03-14 12:54:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8dcc12f215
					 | 
					
						
						
							
							CRM:code review 客户总量统计
						
						
						
						
						
						
					 | 
					
						2024-03-09 16:32:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cherishsince
							
						 
					 | 
					
						
						
							
						
						33d77b9b16
					 | 
					
						
						
							
							配置 yudao-dependencies spring-ai依赖
						
						
						
						
						
						
					 | 
					
						2024-03-03 20:19:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						31e8777a7b
					 | 
					
						
						
							
							✨ CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能
						
						
						
						
						
						
					 | 
					
						2024-02-26 13:09:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a390fb4519
					 | 
					
						
						
							
							✨ CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能
						
						
						
						
						
						
					 | 
					
						2024-02-26 12:55:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						088fbb2096
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
						
						
						
						
						
						
					 | 
					
						2024-02-26 12:25:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9ea7bde751
					 | 
					
						
						
							
							📖 ERP:增加 ERP 首页的统计
						
						
						
						
						
						
					 | 
					
						2024-02-18 19:05:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						20f8cb1606
					 | 
					
						
						
							
							✨ 2.0.1 版本发布准备
						
						
						
						
						
						
					 | 
					
						2024-02-17 21:01:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						94153cb59e
					 | 
					
						
						
							
							✨ 增加 ERP 系统的介绍
						
						
						
						
						
						
					 | 
					
						2024-02-17 10:10:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bfe3dc95fe
					 | 
					
						
						
							
							✨ ERP:增加供应商的实现
						
						
						
						
						
						
					 | 
					
						2024-02-06 17:59:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e9a29e6dd4
					 | 
					
						
						
							
							CRM:优化合同金额排行、回款金额排行
						
						
						
						
						
						
					 | 
					
						2024-02-03 01:14:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |