owen
|
5851bcb479
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-12-17 10:05:13 +08:00 |
|
芋道源码
|
bada32750c
|
!795 CRM: 完善线索、商机、联系人、客户、合同、回款、回款计划数据权限
Merge pull request !795 from puhui999/develop
|
2023-12-17 01:54:29 +00:00 |
|
YunaiV
|
e1bb546460
|
✨ MALL：1）优惠劵增加返回使用范围；2）商品分类增加 id 批量查询
|
2023-12-16 18:32:54 +08:00 |
|
puhui999
|
289f0409d0
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2023-12-13 17:52:32 +08:00 |
|
owen
|
6de17c38fd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-12-13 16:24:57 +08:00 |
|
puhui999
|
72cebfca14
|
CombinationRecordApiImpl 重命名一下 recordService 改为 combinationRecordService 解决和 mzt-biz-log 组件的 bean 冲突
|
2023-12-12 16:23:48 +08:00 |
|
YunaiV
|
e71867683e
|
📖 MALL：调整接口文档的说明
|
2023-12-12 12:11:28 +08:00 |
|
owen
|
f8604e17a1
|
营销：修正文章字段名、接口方法名
|
2023-12-08 10:20:16 +08:00 |
|
YunaiV
|
98697ee075
|
⬆️
|
2023-12-07 20:48:11 +08:00 |
|
芋道源码
|
a8e8c14ab3
|
!787 合并最新商城代码
Merge pull request !787 from 芋道源码/feature/mall_product
|
2023-12-07 11:48:54 +00:00 |
|
YunaiV
|
eeeafcc10c
|
1.9.0 版本发布
|
2023-11-30 21:14:13 +08:00 |
|
芋道源码
|
fa1aa51c96
|
!771 同步最新的 CRM 代码
Merge pull request !771 from 芋道源码/feature/crm
|
2023-11-30 12:50:49 +00:00 |
|
Ai3_刘小龙
|
7b587a79ca
|
返回使用过优惠券逻辑---->状态字段取错了
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
|
2023-11-28 09:16:58 +00:00 |
|
puhui999
|
79600774ec
|
crm-客户：分页查询 mapper 还是得拆成两个，怎么查逻辑交给 service 去做处理
|
2023-11-28 14:27:36 +08:00 |
|
YunaiV
|
4a3aa1fa08
|
营销：适配商城装修组件【优惠券】
|
2023-11-24 19:55:07 +08:00 |
|
owen
|
49accc946d
|
营销：适配商城装修组件【优惠券】
|
2023-11-22 16:58:01 +08:00 |
|
YunaiV
|
989d7c44d0
|
code review 店铺装修
|
2023-11-04 22:52:41 +08:00 |
|
YunaiV
|
787de1be94
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
# sql/mysql/ruoyi-vue-pro.sql
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
|
2023-11-04 20:48:27 +08:00 |
|
owen
|
bdfb5b8894
|
营销：装修页面适配
|
2023-11-03 09:18:04 +08:00 |
|
owen
|
9996608da6
|
营销：装修模板APP接口
|
2023-11-03 06:38:49 +08:00 |
|
owen
|
32499be98f
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2023-10-31 16:01:23 +08:00 |
|
YunaiV
|
d048daf7d6
|
mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖
|
2023-10-30 12:53:54 +08:00 |
|
owen
|
c637a172ec
|
营销：装修代码整理
|
2023-10-29 18:50:55 +08:00 |
|
owen
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2023-10-27 14:58:04 +08:00 |
|
YunaiV
|
3a9ac56f96
|
修复 banner 返回字段不对
|
2023-10-24 20:29:15 +08:00 |
|
YunaiV
|
c11300d33a
|
解决启动问题
|
2023-10-24 19:54:49 +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 |
|
puhui999
|
ff3b1e942a
|
Banner: market ==> promotion
|
2023-10-24 18:00:35 +08:00 |
|
YunaiV
|
df00126fa4
|
统一 boot 和 cloud 代码
|
2023-10-24 13:39:21 +08:00 |
|
YunaiV
|
7bff98b658
|
统一 boot 和 cloud 代码
|
2023-10-23 23:48:06 +08:00 |
|
YunaiV
|
054569a3d3
|
promotion：去除已经不使用的代码
|
2023-10-23 19:24:04 +08:00 |
|
puhui999
|
6723cae781
|
营销活动：完善 review 提到的问题
|
2023-10-23 12:02:13 +08:00 |
|
YunaiV
|
728308cbc0
|
member：优化部分变量的命名
|
2023-10-22 16:35:48 +08: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 |
|
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
|
f363c598d8
|
Banner：完善 review 提到的问题
|
2023-10-21 17:09:04 +08:00 |
|
puhui999
|
f18a4741a9
|
营销活动：完善 review 提到的问题
|
2023-10-20 22:32:37 +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 |
|
puhui999
|
6e11154010
|
SPU: 添加选择优惠卷
|
2023-10-20 11:35:16 +08:00 |
|
YunaiV
|
453f69931f
|
code review：营销文章
|
2023-10-19 23:41:39 +08:00 |
|
puhui999
|
ffbf9278b8
|
营销文章：修正文章浏览量类型错误，新增时初始化浏览量
|
2023-10-18 11:27:14 +08:00 |
|
puhui999
|
6081ce30d5
|
营销活动：完善 review 提到的问题
|
2023-10-18 11:09:20 +08:00 |
|
YunaiV
|
d842708c23
|
code review：数据统计
|
2023-10-16 23:42:54 +08:00 |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2023-10-16 22:51:19 +08:00 |
|
puhui999
|
4273b8f09c
|
营销活动：完善 review 提到的问题
|
2023-10-16 18:53:25 +08:00 |
|