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 |
|
芋道源码
|
0719efb4c2
|
!695 feat: 客户表的 crud
Merge pull request !695 from wanwan/feature/crm
|
2023-10-27 14:41:38 +00:00 |
|
芋道源码
|
ecb36eef67
|
!691 crm联系人前端
Merge pull request !691 from zyna/feature/crm
|
2023-10-27 14:33:38 +00:00 |
|
owen
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2023-10-27 14:58:04 +08:00 |
|
puhui999
|
8552e86d8a
|
完善三方登录
|
2023-10-26 17:03:26 +08:00 |
|
ljlleo
|
75115bcc48
|
1、商机前端页面；
2、商机状态类型和商机状态字段的处理；
|
2023-10-26 16:22:44 +08:00 |
|
jason
|
5f29399cf4
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-25 23:42:25 +08:00 |
|
jason
|
626bd0bd55
|
转账 - code review 修改
|
2023-10-25 23:41:59 +08:00 |
|
puhui999
|
12ae5bf128
|
新增社交用户 RUD
|
2023-10-25 16:57:13 +08:00 |
|
puhui999
|
738fcef453
|
新增社交客户端 CRUD
|
2023-10-25 16:07:17 +08:00 |
|
puhui999
|
eb4b719b4b
|
添加社交客户端测试 sql
|
2023-10-25 15:09:34 +08:00 |
|
Wanwan
|
866eaedfeb
|
feat: 客户表的 crud
|
2023-10-25 00:32:49 +08:00 |
|
Wanwan
|
04613af0cd
|
feat: 客户表的 crud
|
2023-10-25 00:25:00 +08:00 |
|
YunaiV
|
126dc610b1
|
1.8.3 版本发布
|
2023-10-24 23:14:14 +08:00 |
|
YunaiV
|
3fdc132c17
|
1.8.3 版本发布
|
2023-10-24 20:53:37 +08:00 |
|
YunaiV
|
3a9ac56f96
|
修复 banner 返回字段不对
|
2023-10-24 20:29:15 +08:00 |
|
YunaiV
|
c11300d33a
|
解决启动问题
|
2023-10-24 19:54:49 +08:00 |
|
YunaiV
|
a4aa1fac0b
|
Merge branch 'feature/v2.7.17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-10-24 19:13:09 +08:00 |
|
YunaiV
|
52e735f360
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
|
2023-10-24 19:09:01 +08:00 |
|
YunaiV
|
07dbfc5546
|
code review：sign 签到逻辑
|
2023-10-24 19:08:08 +08:00 |
|
芋道源码
|
c7695def5e
|
!694 完善 review 提到的问题，商品模块移除对营销模块的依赖
Merge pull request !694 from puhui999/feature/mall_product
|
2023-10-24 10:49:13 +00:00 |
|