YunaiV
|
e9317bf293
|
Merge branch 'feature/mall_product_tmp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
|
2 years ago |
|
芋道源码
|
01641cd1be
|
!696 新增社交客户端 CRUD,新增社交用户 RUD
Merge pull request !696 from puhui999/feature/mall_product_tmp
|
2 years ago |
|
芋道源码
|
20b11092c2
|
!712 商城装修
Merge pull request !712 from 疯狂的世界/feature/mall_product
|
2 years ago |
owen
|
bdfb5b8894
|
营销：装修页面适配
|
2 years ago |
jason
|
cf114409b0
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
f4d600398c
|
转账 - 管理后台增加转账单查询
|
2 years ago |
|
owen
|
9996608da6
|
营销：装修模板APP接口
|
2 years ago |
|
芋道源码
|
bee4b761ec
|
!709 营销：完善商城装修
Merge pull request !709 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
owen
|
32499be98f
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2 years ago |
|
jason
|
48b1c19f28
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
ccccd9f226
|
转账 - 转账代码修改，新增转账示例
|
2 years ago |
|
芋道源码
|
1d3ef770a0
|
!703 商城装修
Merge pull request !703 from 疯狂的世界/feature/mall_diy
|
2 years ago |
|
owen
|
b5f9ed9edf
|
营销：装修SQL调整
|
2 years ago |
|
owen
|
c637a172ec
|
营销：装修代码整理
|
2 years ago |
|
owen
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2 years ago |
puhui999
|
8552e86d8a
|
完善三方登录
|
2 years ago |
|
jason
|
5f29399cf4
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
626bd0bd55
|
转账 - code review 修改
|
2 years ago |
|
puhui999
|
12ae5bf128
|
新增社交用户 RUD
|
2 years ago |
|
puhui999
|
738fcef453
|
新增社交客户端 CRUD
|
2 years ago |
|
puhui999
|
eb4b719b4b
|
添加社交客户端测试 sql
|
2 years ago |
|
YunaiV
|
07dbfc5546
|
code review：sign 签到逻辑
|
2 years ago |
|
芋道源码
|
c7695def5e
|
!694 完善 review 提到的问题，商品模块移除对营销模块的依赖
Merge pull request !694 from puhui999/feature/mall_product
|
2 years ago |
|
puhui999
|
ff3b1e942a
|
Banner: market ==> promotion
|
2 years ago |
|
jason
|
86598dd177
|
转账 - 动态收款人字段修改
|
2 years ago |
|
jason
|
9095394fed
|
钱包 - 创建钱包充值校验修改
|
2 years ago |
|
puhui999
|
3672d0f245
|
商品模块移除对营销模块的依赖
|
2 years ago |
|
puhui999
|
6723cae781
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
ec27a1bae5
|
修复报错的单元测试
|
2 years ago |
|
YunaiV
|
9697aee898
|
code review：钱包的逻辑
|
2 years ago |
|
YunaiV
|
0db4581030
|
code review：签到逻辑
|
2 years ago |
|
芋道源码
|
3e570b8b89
|
!685 完善遗留的问题
Merge pull request !685 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
785fbeeb5b
|
code review：限时折扣活动
|
2 years ago |
|
芋道源码
|
90fb2c62b8
|
!683 mall模块
Merge pull request !683 from zxiaoxiu/discount
|
2 years ago |
|
puhui999
|
0e754a9924
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
f363c598d8
|
Banner：完善 review 提到的问题
|
2 years ago |
|
jason
|
89e847c8cd
|
钱包，转账 review 修改
|
2 years ago |
|
puhui999
|
1bb2010dc0
|
签到记录：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
2f7371b4ea
|
签到记录：完善 review 提到的问题
|
2 years ago |
|
jason
|
db0fbf0596
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
183206e2d3
|
转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式
|
2 years ago |
|
puhui999
|
f18a4741a9
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
f462ac7f96
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
zhangshuai
|
04061b028c
|
mall模块-限时折扣功能
|
2 years ago |
|
puhui999
|
283ca908b7
|
SPU: 完善选择优惠卷
|
2 years ago |
|
puhui999
|
6e11154010
|
SPU: 添加选择优惠卷
|
2 years ago |
|
YunaiV
|
6c8e82ca5a
|
code review：自提统计
|
2 years ago |
|
芋道源码
|
8bd1942083
|
!676 交易：核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
YunaiV
|
453f69931f
|
code review：营销文章
|
2 years ago |
|
YunaiV
|
64b842ed94
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |