Commit Graph

6167 Commits

Author SHA1 Message Date
kyle
555bac151d feat: 基本完成流程抄送 2024-01-16 11:13:31 +08:00
kyle
e21c262bd7 refactor: 重构查找候选人的逻辑 2024-01-16 11:13:26 +08:00
kyle
5ae1d0ab3e fix: 修复3处问题
1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题,导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题
2024-01-16 11:09:02 +08:00
dhb52
5105c6d16f wip: LocalDate.now().atTime 2024-01-16 11:06:01 +08:00
dhb52
08e23a7dc4 wip: style-fix 2024-01-15 22:47:46 +08:00
YunaiV
9819e05d4e Merge branch 'develop' of https://gitee.com/aberizofur/ruoyi-vue-pro into develop 2024-01-15 21:34:47 +08:00
YunaiV
a886ad9785 📖 CRM:跟进记录的 code review 2024-01-15 21:30:32 +08:00
lzxhqs
510b4fd3de 商机模块合并代码 2024-01-15 17:50:46 +08:00
dhb52
4bd97c4baf wip: 根据code review优化代码 2024-01-15 17:41:21 +08:00
YunaiV
410c551e03 📖 CRM:跟进记录的 code review 2024-01-15 13:43:15 +08:00
芋道源码
e64e60c711
!832 CRM: 完善一些 TODO
Merge pull request !832 from puhui999/develop
2024-01-15 04:37:24 +00:00
芋道源码
cc6cb83507
!833 修改:CRM 产品,产品列表查询接入数据权限
Merge pull request !833 from 安浩浩/develop
2024-01-15 04:33:16 +00:00
YunaiV
9b7f6cfbac 📖 CRM:线索的 code review 2024-01-15 12:29:57 +08:00
芋道源码
4ca1f72d4f
!829 CRM:【线索】
Merge pull request !829 from Minh-X/develop
2024-01-15 04:22:23 +00:00
YunaiV
64e1d68923 📖 CRM:待办事项的 code review 2024-01-15 12:15:52 +08:00
anhaohao
454e800067 修改:CRM 产品,产品列表查询接入数据权限 2024-01-15 10:51:23 +08:00
芋道源码
e16f1caae0
!831 WIP: CRM-待办事项
Merge pull request !831 from dhb52/crm-msg
2024-01-15 00:53:04 +00:00
puhui999
0c30f59e02 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-14 22:49:51 +08:00
puhui999
5efa0f327f crm: 完善一些 TODO 2024-01-14 22:49:01 +08:00
dhb52
4558ecd836 wip: 待办事项 2024-01-14 22:45:16 +08:00
lzxhqs
b249c4e852 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-01-14 15:16:39 +08:00
YunaiV
50f7be9976 MALL:简化商评论的 VO 转化,去除无用的接口 2024-01-14 13:21:13 +08:00
lzxhqs
f361d05940 商机模块 2024-01-14 09:52:35 +08:00
puhui999
73c459f360 完善更进 2024-01-14 00:22:17 +08:00
min
2de0fb48ea CRM:【线索】 线索如果不存在或者已经转化,抛出异常 2024-01-13 23:27:21 +08:00
min
fe0bde8417 CRM:【线索】 CrmClueExcelVO 融合到 CrmClueRespVO 里 2024-01-13 23:27:21 +08:00
YunaiV
ed34b18d82 MALL:简化商品分类的 VO 转化 2024-01-13 22:58:24 +08:00
puhui999
eaa8e4be96 操作日志字段解析方法调整 2024-01-13 22:29:05 +08:00
YunaiV
d58da7b2b0 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/90/files pr 2024-01-13 21:08:52 +08:00
YunaiV
8b3bfcbd6b 📖 MALL:code review 商品浏览记录 2024-01-13 20:23:58 +08:00
YunaiV
bbee720710 📖 CRM:code review 拼团记录的实现 2024-01-13 19:34:49 +08:00
芋道源码
1b87b8a42f
!822 接入拼团
Merge pull request !822 from 疯狂的世界/develop
2024-01-13 03:20:25 +00:00
芋道源码
7226f9b9b3
!828 【轻量级 PR】:优化 【代码生成】排序
Merge pull request !828 from 鲜de芒果/develop
2024-01-13 03:19:19 +00:00
YunaiV
df29f0682f 📖 CRM:线索模块的 review 2024-01-13 11:07:28 +08:00
YunaiV
8d2008f2b5 Merge branch 'develop' of https://gitee.com/Minh-X/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
2024-01-13 11:04:20 +08:00
YunaiV
6891b75e27 📖 CRM:产品模块的 review 2024-01-13 10:25:04 +08:00
芋道源码
19c0227cef
!826 CRM 产品分类和产品,优化了操作日志 ,新增获得产品操作日志
Merge pull request !826 from 安浩浩/develop
2024-01-13 02:04:37 +00:00
YunaiV
e79c750b46 📖 CRM:code review 跟进记录的实现 2024-01-13 09:56:53 +08:00
YunaiV
d80406acbb Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
2024-01-13 09:23:56 +08:00
YunaiV
bf966cd610 MALL:简化 SPU 属性 的 VO 转化 2024-01-12 23:18:00 +08:00
YunaiV
f6c8159dac MALL:简化 SPU 的 VO 转化 2024-01-12 22:48:58 +08:00
YunaiV
fe5c5e4223 MALL:调整商品 SPU 字段,简化部分接口 2024-01-12 21:01:44 +08:00
DESKTOP-7VTMC9P\Administrator
f8e85575e0 【轻量级 PR】:优化 【代码生成】排序,从使用上来说,新导入的表是需要操作生成的,按照导入时间逆序符合简便使用习惯。 2024-01-12 14:03:34 +08:00
anhaohao
008f88d185 新增:CRM 产品,新增获得产品操作日志 2024-01-11 17:45:09 +08:00
anhaohao
803816b162 修改:CRM 产品分类和产品,优化了操作日志 2024-01-11 16:02:05 +08:00
owen
31a28cb40d Review代码修改 2024-01-11 12:38:17 +08:00
owen
d6b59743a3 营销:接入 APP 装修页面 2024-01-11 11:55:25 +08:00
owen
680718c78f 营销:统一装修预览图片字段名称 2024-01-11 11:21:24 +08:00
owen
30fce2911f Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/history/AppProductBrowseHistoryController.java
2024-01-11 11:11:05 +08:00
owen
2ab2b510cc 营销:修正拼团接口名称 2024-01-11 00:26:22 +08:00