p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,431 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

5431 Commits

Author SHA1 Message Date
YunaiV 14f006088a code review：敏感词 2023-10-19 23:25:17 +08:00
芋道源码 630890d0ac
!665 修复敏感词单字符检验失败问题 
Merge pull request !665 from 摸鱼散人/master
 2023-10-19 15:18:31 +00:00
YunaiV 979b484d7f saas：支持社交应用的多租户配置（wx 小程序） 2023-10-19 21:42:39 +08:00
YunaiV 6f757e5297 saas：支持社交应用的多租户配置（mp） 2023-10-19 12:54:44 +08:00
YunaiV d256275099 saas：支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
zhijiantianya@gmail.com 00e18a480f code review：钱包、充值、转账的实现 2023-10-18 18:39:05 +08:00
puhui999 ffbf9278b8 营销文章：修正文章浏览量类型错误，新增时初始化浏览量 2023-10-18 11:27:14 +08:00
puhui999 6081ce30d5 营销活动：完善 review 提到的问题 2023-10-18 11:09:20 +08:00
owen 2f69389982 基础设施：数据库文档增加忽略前端FLW_ 2023-10-18 09:46:24 +08:00
owen 0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
 2023-10-17 23:29:11 +08:00
YunaiV 5842a361e2 同步最新 SQL 脚本 2023-10-17 23:23:17 +08:00
owen 0612a13cce 交易：核销订单 2023-10-17 23:18:08 +08:00
芋道源码 ee1d5c7e60
!675 线上修改 文件管理->文件配置->更换主配置 导致文件上传报错 
Merge pull request !675 from 人生三两事/master
 2023-10-17 15:14:52 +00:00
lan 43985bff93 逻辑错误。已缓存master时，修改master会因为id不匹配config导致引用错误的FileClient实现类 2023-10-17 22:01:34 +08:00
zhijiantianya@gmail.com 4b0333f3e9 code review：订单统计 2023-10-17 20:42:22 +08:00
zhijiantianya@gmail.com 0dcab0363d Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-10-17 20:29:54 +08:00
芋道源码 3c6c8aab01
!672 Review代码修改 
Merge pull request !672 from 疯狂的世界/feature/mall_product
 2023-10-17 12:28:47 +00:00
zhijiantianya@gmail.com 0af205ede1 Merge remote-tracking branch 'origin/master' 2023-10-17 18:49:59 +08:00
zhijiantianya@gmail.com c629fd2208 code review：工作流逻辑 2023-10-17 18:49:35 +08:00
owen b1e0129046 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/statistics.sql
 2023-10-17 16:13:46 +08:00
owen 5e65512a92 交易：订单核销 2023-10-17 16:09:37 +08:00
zhijiantianya@gmail.com ba271da427 Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro into feature/mall_product 2023-10-17 10:56:36 +08:00
YunaiV d842708c23 code review：数据统计 2023-10-16 23:42:54 +08:00
YunaiV d2112458d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:51:28 +08:00
YunaiV 1ff9bc6a71 code review：文章管理 2023-10-16 22:51:19 +08:00
jason 34210d3534 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:43:54 +08:00
jason 7d0bcf5d3b wallet - 管理端钱包余额菜单脚本 2023-10-16 22:43:39 +08:00
owen b89ae001ad 统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen 7aa1ecceeb 统计：Review修改 2023-10-16 22:03:37 +08:00
芋道源码 cebdc190b6
!668 营销活动：完善文章相关 app 端接口，完善 review 提到的问题 
Merge pull request !668 from puhui999/feature/mall_product
 2023-10-16 13:55:47 +00:00
owen 6fbb7d6d6d 终端类型参数改为从Controller传入 2023-10-16 21:01:01 +08:00
zhijiantianya@gmail.com b6e63e885d code review：商城统计 2023-10-16 20:01:25 +08:00
puhui999 4273b8f09c 营销活动：完善 review 提到的问题 2023-10-16 18:53:25 +08:00
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
 2023-10-16 17:47:17 +08:00
芋道源码 1502159608
!669 商城首页 
Merge pull request !669 from 疯狂的世界/feature/mall_product
 2023-10-16 09:33:22 +00:00
owen 76f512fc7a 1. APP增加终端Header[terminal] 
2. 订单、会员注册记录来源终端
 2023-10-16 15:06:59 +08:00
owen b6d400e04a 统计：会员终端统计接口实现 2023-10-16 14:23:53 +08:00
owen 6f08645f61 会员：增加字段【注册终端】 2023-10-16 14:22:43 +08:00
owen d3385dcb4f 统计：会员分析数据接口重构 2023-10-16 13:52:00 +08:00
owen 8e35a786ba 统计：处理会员性别统计，存在未知的情况 2023-10-16 13:25:15 +08:00
owen 4f731e9904 统计：处理会员地区统计，存在未知省份的情况 2023-10-16 13:20:11 +08:00
owen bb82c631e9 统计：Review修改 2023-10-16 13:00:14 +08:00
owen ea810bb5d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 10:02:04 +08:00
YunaiV 7345933d6b code review：文章管理 2023-10-16 09:57:57 +08:00
owen df70402484 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 09:55:17 +08:00
owen f5dac38ca5 商城：增加商城首页 2023-10-16 09:51:20 +08:00
YunaiV 69268b525a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 09:07:13 +08:00
YunaiV 4359c584bb code review：拼团逻辑 2023-10-16 09:07:02 +08:00
jason 3db7b30e66 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 08:46:44 +08:00
jason fcbbbc737d wallet - 管理端, 充值套餐脚本 2023-10-16 08:46:27 +08:00