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 |
|
YunaiV
|
dd2f5ba2c3
|
统一 boot 和 cloud 代码
|
2023-10-24 18:48:02 +08:00 |
|
puhui999
|
ff3b1e942a
|
Banner: market ==> promotion
|
2023-10-24 18:00:35 +08:00 |
|
YunaiV
|
d9a5ef3321
|
统一 boot 和 cloud 代码
|
2023-10-24 13:58:35 +08:00 |
|
YunaiV
|
df00126fa4
|
统一 boot 和 cloud 代码
|
2023-10-24 13:39:21 +08:00 |
|
YunaiV
|
af788e36ce
|
bpm：code review
|
2023-10-24 08:47:46 +08:00 |
|
jason
|
86598dd177
|
转账 - 动态收款人字段修改
|
2023-10-24 08:44:30 +08:00 |
|
YunaiV
|
fc2d30cfaf
|
pay：修复单元测试报错
|
2023-10-24 08:09:47 +08:00 |
|
YunaiV
|
7bff98b658
|
统一 boot 和 cloud 代码
|
2023-10-23 23:48:06 +08:00 |
|
jason
|
9095394fed
|
钱包 - 创建钱包充值校验修改
|
2023-10-23 21:47:36 +08:00 |
|
YunaiV
|
633a4c5687
|
pay：微调 enum 的包名
|
2023-10-23 19:56:30 +08:00 |
|
YunaiV
|
054569a3d3
|
promotion：去除已经不使用的代码
|
2023-10-23 19:24:04 +08:00 |
|
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 |
|