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
|
52ebcaaad7
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/
|
2 years ago |
|
YunaiV
|
6c8e82ca5a
|
code review：自提统计
|
2 years ago |
|
芋道源码
|
8bd1942083
|
!676 交易：核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
芋道源码
|
3590336b1c
|
!677 基础设施：数据库文档增加忽略前端FLW_
Merge pull request !677 from 疯狂的世界/pr/infra
|
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 |
|
芋道源码
|
e21422d119
|
!678 营销活动：完善 review 提到的问题
Merge pull request !678 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
f8e4aece31
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
YunaiV
|
14f006088a
|
code review：敏感词
|
2 years ago |
|
芋道源码
|
630890d0ac
|
!665 修复敏感词单字符检验失败问题
Merge pull request !665 from 摸鱼散人/master
|
2 years ago |
|
YunaiV
|
979b484d7f
|
saas：支持社交应用的多租户配置（wx 小程序）
|
2 years ago |
|
YunaiV
|
6f757e5297
|
saas：支持社交应用的多租户配置（mp）
|
2 years ago |
|
YunaiV
|
d256275099
|
saas：支持社交应用的多租户配置
|
2 years ago |
|
zhijiantianya@gmail.com
|
00e18a480f
|
code review：钱包、充值、转账的实现
|
2 years ago |
|
puhui999
|
ffbf9278b8
|
营销文章：修正文章浏览量类型错误，新增时初始化浏览量
|
2 years ago |
|
puhui999
|
6081ce30d5
|
营销活动：完善 review 提到的问题
|
2 years ago |
owen
|
2f69389982
|
基础设施：数据库文档增加忽略前端FLW_
|
2 years ago |
|
owen
|
0c4713b7e0
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
|
2 years ago |
|
YunaiV
|
5842a361e2
|
同步最新 SQL 脚本
|
2 years ago |
|
owen
|
0612a13cce
|
交易：核销订单
|
2 years ago |
|
芋道源码
|
ee1d5c7e60
|
!675 线上修改 文件管理->文件配置->更换主配置 导致文件上传报错
Merge pull request !675 from 人生三两事/master
|
2 years ago |
lan
|
43985bff93
|
逻辑错误。已缓存master时，修改master会因为id不匹配config导致引用错误的FileClient实现类
|
2 years ago |
|
zhijiantianya@gmail.com
|
4b0333f3e9
|
code review：订单统计
|
2 years ago |
|
zhijiantianya@gmail.com
|
0dcab0363d
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
芋道源码
|
3c6c8aab01
|
!672 Review代码修改
Merge pull request !672 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
zhijiantianya@gmail.com
|
0af205ede1
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
zhijiantianya@gmail.com
|
c629fd2208
|
code review：工作流逻辑
|
2 years ago |
|
owen
|
b1e0129046
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/statistics.sql
|
2 years ago |
|
owen
|
5e65512a92
|
交易：订单核销
|
2 years ago |
|
zhijiantianya@gmail.com
|
ba271da427
|
Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
YunaiV
|
d842708c23
|
code review：数据统计
|
2 years ago |
|
YunaiV
|
d2112458d2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2 years ago |
jason
|
34210d3534
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
7d0bcf5d3b
|
wallet - 管理端钱包余额菜单脚本
|
2 years ago |
|
owen
|
b89ae001ad
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
2 years ago |
|
owen
|
7aa1ecceeb
|
统计：Review修改
|
2 years ago |
|
芋道源码
|
cebdc190b6
|
!668 营销活动：完善文章相关 app 端接口，完善 review 提到的问题
Merge pull request !668 from puhui999/feature/mall_product
|
2 years ago |
|
owen
|
6fbb7d6d6d
|
终端类型参数改为从Controller传入
|
2 years ago |
|
zhijiantianya@gmail.com
|
b6e63e885d
|
code review：商城统计
|
2 years ago |
|
puhui999
|
4273b8f09c
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
01ef5f7911
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/ArticleController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java
|
2 years ago |
|
芋道源码
|
1502159608
|
!669 商城首页
Merge pull request !669 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
owen
|
76f512fc7a
|
1. APP增加终端Header[terminal]
2. 订单、会员注册记录来源终端
|
2 years ago |
|
owen
|
b6d400e04a
|
统计：会员终端统计接口实现
|
2 years ago |