Commit Graph

6270 Commits

Author SHA1 Message Date
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
owen
df609df2cf 商品:修正浏览记录 2024-01-11 00:25:55 +08:00
puhui999
6b426fcd01 CRM: 修复一下差异 2024-01-10 22:06:02 +08:00
puhui999
ad4044f932 Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
2024-01-10 21:13:33 +08:00
puhui999
19fa65b0c3 CRM: 新增跟进记录 2024-01-10 21:09:08 +08:00
puhui999
ba103d6e86 CRM: 完善一些 TODO 提到的问题 2024-01-10 16:25:55 +08:00
puhui999
1a5fe6fa9a CRM: 完善客户、联系人、合同、回款计划、回款的操作日志 2024-01-10 15:28:53 +08:00
puhui999
9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2024-01-10 11:29:29 +08:00
min
0ee7fedea8 CRM:【线索】使用BeanUtils替换mapstruct 2024-01-10 00:38:23 +08:00
min
99b8465e29 CRM:【线索】SaveReqVO去除客户编号字段 2024-01-10 00:16:37 +08:00
min
1280f49a04 CRM:【线索】转化为客户接口修改 2024-01-10 00:10:47 +08:00
YunaiV
722b33513c 📖 CRM:code review 线索模块 2024-01-09 21:58:50 +08:00
YunaiV
6a93484260 📖 CRM:code review 线索模块 2024-01-09 13:52:04 +08:00
芋道源码
e4936725f5
!819 CRM:【线索】
Merge pull request !819 from Minh-X/develop
2024-01-09 05:40:45 +00:00
min
81f838c5d2 CRM:【线索】创建、更新线索时添加校验,改用相同vo 2024-01-09 01:30:42 +08:00
min
4d68e5e747 CRM:【线索】创建线索时客户改为非必填 2024-01-09 01:27:53 +08:00
min
4237cfb4a9 CRM:【线索】线索转化为客户 2024-01-09 01:27:53 +08:00
YunaiV
63db275af1 MALL:默认异步记录商品访问日志、访问次数 2024-01-08 19:14:09 +08:00
YunaiV
772b794374 📖 CRM:code review CRM 产品分类 2024-01-08 19:08:03 +08:00
芋道源码
dab0211385
!818 新增:CRM 产品分类和产品,接入操作日志,数据权限控制
Merge pull request !818 from 安浩浩/develop
2024-01-08 10:59:11 +00:00
anhaohao
4afff6185e 新增:CRM 产品分类和产品,接入操作日志,数据权限控制 2024-01-08 15:15:42 +08:00
YunaiV
2d1e57554d 📖 CRM:code review CRM 客户逻辑 2024-01-07 22:07:17 +08:00
芋道源码
3c7f63c356
!810 fix:修复 issues 提到的一些公众号上的问题
Merge pull request !810 from puhui999/develop
2024-01-07 13:23:53 +00:00
YunaiV
df9ff3fc5c 🐛 MALL:修复 issue 提到的 bug 2024-01-07 20:51:57 +08:00
芋道源码
761ab8a0e5
!809 修复BUG, 会员当前有等级的时候下订单会把当前等级给清空了。
Merge pull request !809 from 云扬四海/fix-member-level-bug-0102
2024-01-07 12:47:46 +00:00
芋道源码
d728c36c1e
!811 修复订单操作日志中快递公司名称模板与数据对不上的问题
Merge pull request !811 from 杨宇庆/N/A
2024-01-07 12:45:01 +00:00
YunaiV
19d5a0c2aa 📖 CRM:code review crm 联系人新增操作日志 2024-01-07 18:19:08 +08:00
芋道源码
450cd1baf1
!817 crm联系人新增操作日志
Merge pull request !817 from zyna/develop
2024-01-07 08:27:28 +00:00
YunaiV
bbba83ef61 📖 MALL:code review 商品统计的代码 2024-01-07 16:23:02 +08:00
YunaiV
eb048532f7 Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
2024-01-06 21:52:10 +08:00
zyna
44d828023c crm联系人新增操作日志 2024-01-06 21:06:38 +08:00
YunaiV
a259e032e1 MALL:增加商品列表的分类编号数组、商品编号的筛选 2024-01-06 20:42:32 +08:00
puhui999
68f5edaa88 CRM-客户: 完善一些 TODO 2024-01-06 15:28:10 +08:00
puhui999
3170e7fd97 CRM-客户: 简化客户公海配置 VO,完善相关操作日志 2024-01-06 13:48:22 +08:00
puhui999
9ce50ec369 CRM-客户限制配置:VO 简化 2024-01-06 13:04:30 +08:00
puhui999
269816446a CRM-客户:日志表达式调整 2024-01-06 12:27:30 +08:00
YunaiV
f73cb540cf MALL:去除分销提现的银行配置 2024-01-05 22:46:35 +08:00
puhui999
a1c17b9b00 CRM-客户:日志表达式调整 2024-01-05 17:40:21 +08:00
owen
9203f485e9 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
2024-01-05 15:40:29 +08:00
puhui999
d8bb55fc0b CRM-客户:完善操作日志 2024-01-05 14:43:48 +08:00
YunaiV
1ae535fc87 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-05 01:31:14 +08:00
YunaiV
3091a0882f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-05 01:29:57 +08:00
YunaiV
ee250c74d6 MALL:更新 uni-app + Vue3 实现 2024-01-05 01:28:39 +08:00
puhui999
ea4b4b8956 CRM-客户:精简 VO 2024-01-05 00:15:26 +08:00
puhui999
e6f4c1f0d5 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-04 09:59:50 +08:00
YunaiV
a974d055b6 📖 CRM:【还款】code review 还款的代码,补全对应的 todo list 2024-01-04 09:41:58 +08:00
YunaiV
c6a9751511 📖 CRM:【合同】code review 合同的代码,补全对应的 todo list 2024-01-04 09:18:44 +08:00
YunaiV
2668e0cfeb 📖 CRM:【产品】code review 产品的代码,补全对应的 todo list 2024-01-04 08:01:04 +08:00