puhui999
|
3672d0f245
|
商品模块移除对营销模块的依赖
|
2023-10-23 17:29:26 +08:00 |
|
puhui999
|
6723cae781
|
营销活动：完善 review 提到的问题
|
2023-10-23 12:02:13 +08:00 |
|
xingyu
|
a39a0e68a0
|
fix: vben codegen
|
2023-10-23 11:49:23 +08:00 |
|
xingyu
|
98561731f5
|
chore: update deps
|
2023-10-23 11:38:55 +08:00 |
|
xingyu
|
f0d3614c34
|
fix: reset config
|
2023-10-23 11:38:41 +08:00 |
|
xingyu
|
1611dd4b23
|
docs: up springboot 2.7.17
|
2023-10-23 11:38:28 +08:00 |
|
xingyu
|
f3f2efcced
|
feat: update springboot 2.7.17
|
2023-10-23 11:38:01 +08:00 |
|
YunaiV
|
a778c25075
|
product：优化代码实现，简化重复判空
|
2023-10-22 21:44:05 +08:00 |
|
zyna
|
918ffc40ae
|
crm联系人前端init
|
2023-10-22 16:40:57 +08:00 |
|
YunaiV
|
728308cbc0
|
member：优化部分变量的命名
|
2023-10-22 16:35:48 +08:00 |
|
YunaiV
|
94c2ad5d1d
|
修复报错的单元测试
|
2023-10-22 08:55:27 +08:00 |
|
YunaiV
|
d0caa77f80
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-10-22 08:25:27 +08:00 |
|
YunaiV
|
ec27a1bae5
|
修复报错的单元测试
|
2023-10-22 08:24:47 +08:00 |
|
YunaiV
|
55f9e0131c
|
code review：CRM 客户联系人的管理
|
2023-10-21 22:20:00 +08:00 |
|
YunaiV
|
723707c7ed
|
Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2023-10-21 22:13:34 +08:00 |
|
YunaiV
|
b5560fa0be
|
code review：CRM 线索表的逻辑
|
2023-10-21 22:05:37 +08:00 |
|
YunaiV
|
9cf4cfca86
|
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2023-10-21 22:00:15 +08:00 |
|
YunaiV
|
f942e2c7f2
|
code review：CRM 回款计划的逻辑
|
2023-10-21 21:55:21 +08:00 |
|
YunaiV
|
56b59cf383
|
Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# sql/mysql/crm_menu.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2023-10-21 21:41:16 +08:00 |
|
YunaiV
|
6f8fd383f7
|
code review：CRM 商机的逻辑
|
2023-10-21 21:35:35 +08:00 |
|
芋道源码
|
24e6deb82b
|
!682 商机
Merge pull request !682 from 刘先生/feature/crm
|
2023-10-21 13:19:46 +00:00 |
|
YunaiV
|
9697aee898
|
code review：钱包的逻辑
|
2023-10-21 21:17:49 +08:00 |
|
YunaiV
|
3bb3e4caf6
|
code review：工作流的加减签
|
2023-10-21 21:04:20 +08:00 |
|
芋道源码
|
cc67174f87
|
!689 【工作流】--加签减签review
Merge pull request !689 from Youkehai/feature/bpm-addSignAndSubSign
|
2023-10-21 11:59:22 +00:00 |
|
YunaiV
|
0db4581030
|
code review：签到逻辑
|
2023-10-21 19:56:53 +08:00 |
|
芋道源码
|
3e570b8b89
|
!685 完善遗留的问题
Merge pull request !685 from puhui999/feature/mall_product
|
2023-10-21 11:31:56 +00:00 |
|
kehaiyou
|
6dfef29834
|
feat: 控制查找子任务次数和清除递归代码
|
2023-10-21 18:31:30 +08:00 |
|
kehaiyou
|
aca65a66b5
|
feat: 【工作流】--加减签review修改
|
2023-10-21 18:16:21 +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 |
|
puhui999
|
0e754a9924
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-10-21 17:09:24 +08:00 |
|
puhui999
|
f363c598d8
|
Banner：完善 review 提到的问题
|
2023-10-21 17:09:04 +08:00 |
|
jason
|
89e847c8cd
|
钱包，转账 review 修改
|
2023-10-21 15:28:07 +08:00 |
|
puhui999
|
1bb2010dc0
|
签到记录：完善 review 提到的问题
|
2023-10-21 01:11:10 +08:00 |
|
puhui999
|
2f7371b4ea
|
签到记录：完善 review 提到的问题
|
2023-10-21 01:01:06 +08:00 |
|
913752709@qq.com
|
e4eeaa1d69
|
feat: crm 线索表完善 review 提到的问题
|
2023-10-21 00:53:18 +08:00 |
|
913752709@qq.com
|
435d7dcfca
|
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueBaseVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/clue/CrmClueDO.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
|
2023-10-21 00:09:44 +08:00 |
|
liuhongfeng
|
34a5785768
|
【新增】回款计划 功能
|
2023-10-20 23:48:19 +08:00 |
|
zyna
|
e4943f0dfa
|
crm联系人
|
2023-10-20 23:42:22 +08:00 |
|
jason
|
db0fbf0596
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-20 23:22:16 +08:00 |
|
jason
|
183206e2d3
|
转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式
|
2023-10-20 23:20:47 +08:00 |
|
puhui999
|
f18a4741a9
|
营销活动：完善 review 提到的问题
|
2023-10-20 22:32:37 +08:00 |
|
liuhongfeng
|
73f4fc8ceb
|
【新增】回款管理 功能
|
2023-10-20 22:16:34 +08:00 |
|
puhui999
|
f462ac7f96
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-10-20 21:04:47 +08:00 |
|
zhangshuai
|
04061b028c
|
mall模块-限时折扣功能
|
2023-10-20 20:54:16 +08:00 |
|
puhui999
|
283ca908b7
|
SPU: 完善选择优惠卷
|
2023-10-20 16:35:49 +08:00 |
|
ljlleo
|
01490c879c
|
商机sql
|
2023-10-20 16:14:45 +08:00 |
|
ljlleo
|
bee6f41211
|
商机
|
2023-10-20 16:01:54 +08:00 |
|
puhui999
|
6e11154010
|
SPU: 添加选择优惠卷
|
2023-10-20 11:35:16 +08:00 |
|
YunaiV
|
52ebcaaad7
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/
|
2023-10-20 00:31:35 +08:00 |
|