Commit Graph

6430 Commits

Author SHA1 Message Date
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
wgs7909
3dade7fd54 新增用户时,给部门增加默认值。
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 07:07:11 +08:00
wgs7909
a0c142f886 新增用户时,给部门增加默认值。
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 06:42:12 +08:00
wgs7909
ab9dc8ad71 新增用户时,给部门增加默认值。
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 06:39:57 +08:00
liuhongfeng
95e9dc81c9 【修改】回款计划和回款管理统一带上Crm前缀,防止和其他模块冲突。 2023-10-31 01:09:40 +08:00
liuhongfeng
f1f180ff77 【新增】字典归类
【修改】规范实体命名和字段类型修改
2023-10-31 00:35:41 +08:00
liuhongfeng
798dd3269f Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-30 21:35:14 +08:00
liuhongfeng
921c2ab757 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:33:28 +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
zhijiantianya@gmail.com
4dab376ca9 code review:数据权限的实现 2023-10-30 19:28:33 +08: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
芋道源码
9f1b92abd9
!704 完善 CRM-数据权限校验方式
Merge pull request !704 from puhui999/feature/crm
2023-10-30 09:34:59 +00:00
puhui999
7cd5272e7f Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2023-10-30 16:54:14 +08:00
puhui999
c2fd817989 完善 CRM-客户 数据权限校验 2023-10-30 16:52:01 +08:00
puhui999
e6eaa3a24a 完善 CRM-数据权限校验方式 2023-10-30 16:29:24 +08:00
YunaiV
d048daf7d6 mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖 2023-10-30 12:53:54 +08:00
puhui999
19c9b6ae93 新增 CRM-数据权限 service 2023-10-30 11:17:43 +08:00
puhui999
bec8a27a21 新增 CRM-数据权限 注解实现 2023-10-30 00:49:36 +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
liuhongfeng
fc087fa252 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 19:27:16 +08:00
YunaiV
054d80b472 code review:同步 crm 最新代码 2023-10-29 19:23:09 +08:00
YunaiV
53afce0bff code review:crm 回款 2023-10-29 19:22:09 +08:00
YunaiV
973b710992 code review:crm 商机 2023-10-29 19:14:15 +08:00
YunaiV
d1978d318b code review:crm 合同 2023-10-29 19:05:36 +08:00
owen
c637a172ec 营销:装修代码整理 2023-10-29 18:50:55 +08:00
YunaiV
67ac11b56c code review:crm 客户转移 2023-10-29 18:39:54 +08:00
liuhongfeng
9608cf0539 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 18:03:01 +08:00
liuhongfeng
677e8ab2fc 【修改】回款计划-修改字段类型
【修改】修改回款计划-创建逻辑,添加客户的数据校验
2023-10-29 18:00:34 +08:00
芋道源码
f73b857551
!702 CRM【商机】【联系人】【合同】新增 transfer 接口
Merge pull request !702 from puhui999/feature/crm
2023-10-29 09:55:09 +00:00
YunaiV
fe50356ae8 code review:crm 客户模块的实现 2023-10-29 17:38:59 +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
芋道源码
d8e49fa0f6
!701 feat: 调整 CRM 客户表的字段
Merge pull request !701 from wanwan/feature/crm
2023-10-29 02:36:55 +00:00
puhui999
722e9c8a04 CRM-商机:新增商机转移接口 2023-10-29 02:04:26 +08:00
puhui999
36a76c5ce6 CRM-联系人:新增联系人转移接口 2023-10-29 01:42:22 +08:00
puhui999
d9f6fb241a 合同:新增合同转移接口 2023-10-29 01:23:06 +08:00
Wanwan
3af9688383 feat: 调整客户表的字段 2023-10-29 00:33:42 +08:00
Wanwan
c18f5baa4b feat: 调整客户表的字段 2023-10-28 22:47:56 +08:00
Jayson Albert
f4ea648ac9 fix: 修复PayWalletRechargeCerate参数校验 2023-10-28 19:45:06 +08:00
liuhongfeng
b0ddd522fb Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-28 00:37:59 +08:00
liuhongfeng
301f497527 【新增】回款计划-审批枚举类
【新增】回款计划-回款方式枚举类
【新增】回款计划-枚举类校验
【修改】回款计划-错误码调整
【修改】修改回款计划-创建逻辑,添加合同数据的校验
2023-10-28 00:37:47 +08:00
YunaiV
81b6aebf47 code review:商机表的实现 2023-10-27 23:27:08 +08:00
YunaiV
bf247a6626 Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/crm.sql
2023-10-27 23:11:16 +08:00
YunaiV
74f786f8ed code review:客户表的实现 2023-10-27 22:56:46 +08:00