puhui999
							
						 
					 | 
					
						
						
							
						
						127a98a934
					 | 
					
						
						
							
							MALL-KEFU: 新增客服相关操作接口
						
						
						
						
						
						
					 | 
					
						2024-05-31 16:59:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						df08a2ecf0
					 | 
					
						
						
							
							【优化】新增 quartz.sql,完善 README.md
						
						
						
						
						
						
					 | 
					
						2024-05-03 11:28:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1d00261c77
					 | 
					
						
						
							
							【优化】demo 功能,使用 yudao 作为表前缀,避免影响理解
						
						
						
						
						
						
					 | 
					
						2024-04-30 10:00:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DevDengChao
							
						 
					 | 
					
						
						
							
						
						af597f2329
					 | 
					
						
						
							
							补充短信渠道与短信模板的启用状态示例值
						
						
						
						
						
						
					 | 
					
						2024-04-28 14:23:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DevDengChao
							
						 
					 | 
					
						
						
							
						
						fc0a1f669d
					 | 
					
						
						
							
							fix: 修复短信模板中关于 type 字段的描述
						
						
						
						
						
						
					 | 
					
						2024-04-28 13:48:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6f42da1b77
					 | 
					
						
						
							
							【修复】部分菜单,确实 menu.sql 配置的权限标识
						
						
						
						
						
						
					 | 
					
						2024-04-24 20:11:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fb237fa22e
					 | 
					
						
						
							
							【完善】代码生成对 DM 达梦数据的兼容性
						
						
						
						
						
						
					 | 
					
						2024-04-24 09:35:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						909d3309d2
					 | 
					
						
						
							
							【优化】支持登陆用户,直接读取昵称、部门等信息,也支持自定义字段
						
						
						
						
						
						
					 | 
					
						2024-04-07 19:39:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						000b6cf47f
					 | 
					
						
						
							
							【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件
						
						
						
						
						
						
					 | 
					
						2024-04-04 01:21:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						132c1cc828
					 | 
					
						
						
							
							【优化】增强访问日志,支持是否记录、脱敏、操作信息等功能
						
						
						
						
						
						
					 | 
					
						2024-04-03 19:52:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dcf6cc293e
					 | 
					
						
						
							
							BPM:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差
						
						
						
						
						
						
					 | 
					
						2024-03-30 20:44:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						18f6bdd1c0
					 | 
					
						
						
							
							最新菜单 SQL 的同步
						
						
						
						
						
						
					 | 
					
						2024-03-24 10:41:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						835bbe7e42
					 | 
					
						
						
							
							🎉 2.0.1 版本发布!
						
						
						
						
						
						
					 | 
					
						2024-03-01 19:40:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a390fb4519
					 | 
					
						
						
							
							✨ CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能
						
						
						
						
						
						
					 | 
					
						2024-02-26 12:55:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						20f8cb1606
					 | 
					
						
						
							
							✨ 2.0.1 版本发布准备
						
						
						
						
						
						
					 | 
					
						2024-02-17 21:01:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0dff03b8b1
					 | 
					
						
						
							
							🔥 2.0.0 版本发布准备~
						
						
						
						
						
						
					 | 
					
						2024-01-26 20:37:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fea84deca0
					 | 
					
						
						
							
							✨ Pay:code review 支付转账的部分逻辑
						
						
						
						
						
						
					 | 
					
						2024-01-18 23:58:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a5dc4e7876
					 | 
					
						
						
							
							!839 流程增加抄送功能
						
						
						
						
						
						
						
						Merge pull request !839 from 云开/feature/BPM_CC_develop 
						
						
					 | 
					
						2024-01-18 04:18:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						3cc127496e
					 | 
					
						
						
							
							!842 update sql/mysql/ruoyi-vue-pro.sql.
						
						
						
						
						
						
						
						Merge pull request !842 from jay浅蓝/N/A 
						
						
					 | 
					
						2024-01-18 04:08:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ca55282516
					 | 
					
						
						
							
							CRM:商机 code review
						
						
						
						
						
						
					 | 
					
						2024-01-18 12:06:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jay浅蓝
							
						 
					 | 
					
						
						
							
						
						867d8bc3cd
					 | 
					
						
						
							
							update sql/mysql/ruoyi-vue-pro.sql.
						
						
						
						
						
						
						
						数据库缺少trade:order:query 和 trade:order:update权限,会导致订单的发货和更多按钮无法显示。
Signed-off-by: jay浅蓝 <565215951@qq.com> 
						
						
					 | 
					
						2024-01-18 03:43:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kyle
							
						 
					 | 
					
						
						
							
						
						8f171ba3d0
					 | 
					
						
						
							
							feat: 添加抄送人相关功能以及接口
						
						
						
						
						
						
					 | 
					
						2024-01-16 11:13:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lzxhqs
							
						 
					 | 
					
						
						
							
						
						f361d05940
					 | 
					
						
						
							
							商机模块
						
						
						
						
						
						
					 | 
					
						2024-01-14 09:52:35 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyna
							
						 
					 | 
					
						
						
							
						
						bd76ea59a7
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/crm' into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java 
						
						
					 | 
					
						2023-12-17 17:47:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyna
							
						 
					 | 
					
						
						
							
						
						8434a8cd68
					 | 
					
						
						
							
							crm联系人商机功能修改
						
						
						
						
						
						
					 | 
					
						2023-12-17 17:33:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						f374e778bb
					 | 
					
						
						
							
							商品:增加商品浏览记录
						
						
						
						
						
						
					 | 
					
						2023-12-17 17:20:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						4a007f0c98
					 | 
					
						
						
							
							统计:增加商品统计
						
						
						
						
						
						
					 | 
					
						2023-12-16 23:48:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						0d3efe4f80
					 | 
					
						
						
							
							【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						9350523b35
					 | 
					
						
						
							
							【新增】ureport2菜单,初始化数据
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						7c43c3a2b1
					 | 
					
						
						
							
							【新增】ureport2 集成的SQL语句
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						8507fa9172
					 | 
					
						
						
							
							【新增】ureport2 集成
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						21a3870c00
					 | 
					
						
						
							
							!775 crm联系人商机功能
						
						
						
						
						
						
						
						Merge pull request !775 from zyna/feature/crm 
						
						
					 | 
					
						2023-12-06 05:57:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						73e76ab453
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/crm
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java 
						
						
					 | 
					
						2023-12-05 22:42:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyna
							
						 
					 | 
					
						
						
							
						
						910bc09e19
					 | 
					
						
						
							
							crm联系人商机功能
						
						
						
						
						
						
					 | 
					
						2023-12-03 20:01:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						72969e921e
					 | 
					
						
						
							
							crm: 增加基于客户查询回款计划分页
						
						
						
						
						
						
					 | 
					
						2023-12-01 22:46:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f02b9464bd
					 | 
					
						
						
							
							crm: 增加基于客户查询回款分页
						
						
						
						
						
						
					 | 
					
						2023-12-01 19:37:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a5c59c6079
					 | 
					
						
						
							
							1.9.0 版本发布
						
						
						
						
						
						
					 | 
					
						2023-12-01 07:37:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						eeeafcc10c
					 | 
					
						
						
							
							1.9.0 版本发布
						
						
						
						
						
						
					 | 
					
						2023-11-30 21:14:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						fa1aa51c96
					 | 
					
						
						
							
							!771 同步最新的 CRM 代码
						
						
						
						
						
						
						
						Merge pull request !771 from 芋道源码/feature/crm 
						
						
					 | 
					
						2023-11-30 12:50:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						455f8e49fb
					 | 
					
						
						
							
							crm:code review 联系人
						
						
						
						
						
						
					 | 
					
						2023-11-27 20:42:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyna
							
						 
					 | 
					
						
						
							
						
						3f3899f5d3
					 | 
					
						
						
							
							crm联系人review修改,新增地区字段
						
						
						
						
						
						
					 | 
					
						2023-11-27 20:42:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3e9eb59de3
					 | 
					
						
						
							
							crm:code review 数据权限的实现
						
						
						
						
						
						
					 | 
					
						2023-11-25 10:55:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JiangQi
							
						 
					 | 
					
						
						
							
						
						0955ad0fc0
					 | 
					
						
						
							
							promotion:combination-activity:query后多个tab
						
						
						
						
						
						
					 | 
					
						2023-11-22 09:22:40 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						667957c941
					 | 
					
						
						
							
							!737 【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci
						
						
						
						
						
						
						
						Merge pull request !737 from souvc/master 
						
						
					 | 
					
						2023-11-18 16:57:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						58ede7d69c
					 | 
					
						
						
							
							【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci
						
						
						
						
						
						
					 | 
					
						2023-11-18 23:30:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8c9c91f0ca
					 | 
					
						
						
							
							crm:code review 配置管理
						
						
						
						
						
						
					 | 
					
						2023-11-18 22:12:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						90f135ad95
					 | 
					
						
						
							
							Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
						
						
						
						
						
						
						
						# Conflicts:
#	sql/mysql/crm.sql 
						
						
					 | 
					
						2023-11-18 21:17:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |