Commit Graph

5621 Commits

Author SHA1 Message Date
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
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