smart-flow/ruoyi-vue-pro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 8bd1942083 !676 交易：核销订单 Merge pull request !676 from 疯狂的世界/feature/mall_product 芋道源码 2023-10-19 15:59:00 +00:00
  • 3590336b1c !677 基础设施：数据库文档增加忽略前端FLW_ Merge pull request !677 from 疯狂的世界/pr/infra 芋道源码 2023-10-19 15:52:56 +00:00
  • 453f69931f code review：营销文章 YunaiV 2023-10-19 23:41:39 +08:00
  • 64b842ed94 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-19 23:31:45 +08:00
  • e21422d119 !678 营销活动：完善 review 提到的问题 Merge pull request !678 from puhui999/feature/mall_product 芋道源码 2023-10-19 15:31:36 +00:00
  • f8e4aece31 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-19 23:31:21 +08:00
  • 14f006088a code review：敏感词 YunaiV 2023-10-19 23:25:17 +08:00
  • 630890d0ac !665 修复敏感词单字符检验失败问题 Merge pull request !665 from 摸鱼散人/master 芋道源码 2023-10-19 15:18:31 +00:00
  • 439edcd1be code review：crm 线索的 crud YunaiV 2023-10-19 23:15:18 +08:00
  • 48661f980c !679 feat: CRM 线索表 crud * feat: CRM 线索表 crud * feat: CRM 线索表 crud wanwan 2023-10-19 14:52:16 +00:00
  • 979b484d7f saas：支持社交应用的多租户配置（wx 小程序） YunaiV 2023-10-19 21:42:39 +08:00
  • 6f757e5297 saas：支持社交应用的多租户配置（mp） YunaiV 2023-10-19 12:54:44 +08:00
  • d256275099 saas：支持社交应用的多租户配置 YunaiV 2023-10-18 23:48:14 +08:00
  • 1b6c8574cd feat: CRM 线索表 crud 913752709@qq.com 2023-10-18 20:02:53 +08:00
  • a09ee495b6 feat: CRM 线索表 crud 913752709@qq.com 2023-10-18 19:53:15 +08:00
  • 00e18a480f code review：钱包、充值、转账的实现 zhijiantianya@gmail.com 2023-10-18 18:39:05 +08:00
  • ffbf9278b8 营销文章：修正文章浏览量类型错误，新增时初始化浏览量 puhui999 2023-10-18 11:27:14 +08:00
  • 6081ce30d5 营销活动：完善 review 提到的问题 puhui999 2023-10-18 11:09:20 +08:00
  • 2f69389982 基础设施：数据库文档增加忽略前端FLW_ owen 2023-10-18 09:46:24 +08:00
  • 0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-17 23:29:11 +08:00
  • 5842a361e2 同步最新 SQL 脚本 YunaiV 2023-10-17 23:23:17 +08:00
  • 0612a13cce 交易：核销订单 owen 2023-10-17 23:18:08 +08:00
  • ee1d5c7e60 !675 线上修改 文件管理->文件配置->更换主配置 导致文件上传报错 Merge pull request !675 from 人生三两事/master 芋道源码 2023-10-17 15:14:52 +00:00
  • b133acd8cd code review：crm 合同流程 YunaiV 2023-10-17 22:52:14 +08:00
  • 43985bff93 逻辑错误。已缓存master时，修改master会因为id不匹配config导致引用错误的FileClient实现类 lan 2023-10-17 22:01:34 +08:00
  • 4b0333f3e9 code review：订单统计 zhijiantianya@gmail.com 2023-10-17 20:42:22 +08:00
  • 0dcab0363d Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product zhijiantianya@gmail.com 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
  • 07f3d09e38 !671 CRM/合同管理 CRUD初稿 Merge pull request !671 from dhb52/feature/crm 芋道源码 2023-10-17 12:02:20 +00:00
  • 0af205ede1 Merge remote-tracking branch 'origin/master' zhijiantianya@gmail.com 2023-10-17 18:49:59 +08:00
  • c629fd2208 code review：工作流逻辑 zhijiantianya@gmail.com 2023-10-17 18:49:35 +08:00
  • b1e0129046 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-17 16:13:46 +08:00
  • 5e65512a92 交易：订单核销 owen 2023-10-17 16:09:37 +08:00
  • ba271da427 Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro into feature/mall_product zhijiantianya@gmail.com 2023-10-17 10:56:36 +08:00
  • 164be5732b feat: CRM/合同管理 - SQL dhb52 2023-10-16 23:53:27 +08:00
  • eedb528412 feat: CRM/合同管理 - crud dhb52 2023-10-16 23:53:17 +08:00
  • e26bd20a5b feat:添加测试配置及excel依赖 dhb52 2023-10-16 23:45:18 +08:00
  • d842708c23 code review：数据统计 YunaiV 2023-10-16 23:42:54 +08:00
  • d2112458d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-10-16 22:51:28 +08:00
  • 1ff9bc6a71 code review：文章管理 YunaiV 2023-10-16 22:51:19 +08:00
  • 34210d3534 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-16 22:43:54 +08:00
  • 7d0bcf5d3b wallet - 管理端钱包余额菜单脚本 jason 2023-10-16 22:43:39 +08:00
  • b89ae001ad 统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 owen 2023-10-16 22:09:20 +08:00
  • 7aa1ecceeb 统计：Review修改 owen 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
  • 6fbb7d6d6d 终端类型参数改为从Controller传入 owen 2023-10-16 21:01:01 +08:00
  • b6e63e885d code review：商城统计 zhijiantianya@gmail.com 2023-10-16 20:01:25 +08:00
  • 4273b8f09c 营销活动：完善 review 提到的问题 puhui999 2023-10-16 18:53:25 +08:00
  • 01ef5f7911 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 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
  • 76f512fc7a 1. APP增加终端Header[terminal] 2. 订单、会员注册记录来源终端 owen 2023-10-16 15:06:59 +08:00
  • b6d400e04a 统计：会员终端统计接口实现 owen 2023-10-16 14:23:53 +08:00
  • 6f08645f61 会员：增加字段【注册终端】 owen 2023-10-16 14:22:43 +08:00
  • d3385dcb4f 统计：会员分析数据接口重构 owen 2023-10-16 13:52:00 +08:00
  • 8e35a786ba 统计：处理会员性别统计，存在未知的情况 owen 2023-10-16 13:25:15 +08:00
  • 4f731e9904 统计：处理会员地区统计，存在未知省份的情况 owen 2023-10-16 13:20:11 +08:00
  • bb82c631e9 统计：Review修改 owen 2023-10-16 13:00:14 +08:00
  • ea810bb5d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-16 10:02:04 +08:00
  • 7345933d6b code review：文章管理 YunaiV 2023-10-16 09:57:57 +08:00
  • df70402484 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-16 09:55:17 +08:00
  • f5dac38ca5 商城：增加商城首页 owen 2023-10-16 09:51:20 +08:00
  • 69268b525a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-10-16 09:07:13 +08:00
  • 4359c584bb code review：拼团逻辑 YunaiV 2023-10-16 09:07:02 +08:00
  • 3db7b30e66 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-16 08:46:44 +08:00
  • fcbbbc737d wallet - 管理端, 充值套餐脚本 jason 2023-10-16 08:46:27 +08:00
  • 4f7c7f5619 wallet - 管理端 钱包余额流水查询 jason 2023-10-16 08:36:28 +08:00
  • 0d45acaf20 营销活动：完善文章相关 app 端接口 puhui999 2023-10-15 22:41:18 +08:00
  • 7bc3b7b2ff !666 营销活动：新增文章管理，文章分类管理 Merge pull request !666 from puhui999/feature/mall_product 芋道源码 2023-10-15 14:05:35 +00:00
  • 7e312aae02 初始化 crm 模块 YunaiV 2023-10-15 20:16:46 +08:00
  • 7cb8f8fab9 wallet - 管理端 钱包余额查询 jason 2023-10-15 17:33:55 +08:00
  • b009f0b058 application-local.yaml 恢复 puhui999 2023-10-15 16:43:04 +08:00
  • 26d3672668 营销活动: 文章分类管理软件包调整 puhui999 2023-10-15 16:40:27 +08:00
  • 1fe6c82899 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-15 16:17:14 +08:00
  • 55eed1377a 营销活动: 新增文章管理 puhui999 2023-10-15 16:16:41 +08:00
  • 944e3862a5 修复敏感词检验问题 1.修复排序，优先使用较短的前缀失效问题 2.修复敏感词为单个字符校验失败问题 daiwencheng 2023-10-15 14:30:43 +08:00
  • a47ab32800 营销活动: 新增文章分类管理 puhui999 2023-10-15 01:29:30 +08:00
  • 6e4a9c3b01 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-10-14 22:00:52 +08:00
  • ca5e3f7bd1 优化最新的商城的 sql YunaiV 2023-10-14 22:00:30 +08:00
  • 8fd814e0c1 !636 测试站内信接口增加Member 用户类型的支持。 Merge pull request !636 from 风狗/feature/mall_product 芋道源码 2023-10-14 09:53:41 +00:00
  • 82fd800ad2 !641 操作日志搜索参数名修改 Merge pull request !641 from ligitee/N/A 芋道源码 2023-10-14 09:52:11 +00:00
  • fa600dbb44 !662 【工作流】添加vue2版本的退回和委派前端代码 Merge pull request !662 from LiuMoffett/moffett 芋道源码 2023-10-14 09:51:00 +00:00
  • 3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files YunaiV 2023-10-14 17:45:49 +08:00
  • 970e524088 code review：交易统计 YunaiV 2023-10-14 13:15:14 +08:00
  • 1ac2f2b5c2 code review：会员统计 YunaiV 2023-10-14 01:26:06 +08:00
  • 0eb86ca269 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-13 20:41:17 +08:00
  • 82545ddaac 优化 README.md，减少静态资源加载 YunaiV 2023-10-13 18:27:30 +08:00
  • a4613f0af9 拼团活动: 完善 review 提到的问题 puhui999 2023-10-13 12:07:28 +08:00
  • e06f61ef39 wallet - 充值套餐 管理端 jason 2023-10-13 10:46:10 +08:00
  • 8cd7941fc3 wallet - 充值套餐 管理端 jason 2023-10-13 10:43:04 +08:00
  • 04d491b90d 优化 README.md，减少静态资源加载 YunaiV 2023-10-13 09:39:40 +08:00
  • 625504333b 优化 README.md YunaiV 2023-10-13 09:35:23 +08:00
  • 3105d86b7d 优化 README.md YunaiV 2023-10-13 09:34:33 +08:00
  • 2e207019b3 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-12 22:21:17 +08:00
  • 571961b4da 充值套餐修改 jason 2023-10-12 22:20:42 +08:00
  • 7a9dbfe41d Merge remote-tracking branch 'origin/master' YunaiV 2023-10-12 21:59:04 +08:00
  • b30754a0a4 同步最新 mall 代码 YunaiV 2023-10-12 21:58:56 +08:00
  • a72869b97e code review：修复部分统计报错 YunaiV 2023-10-12 21:54:06 +08:00
  • 9a876cff3d feat:【工作流】添加vue2版本的退回和委派前端代码 liuxiaolu 2023-10-11 16:08:39 +08:00
  • 4be709b815 统计：Review修改 owen 2023-10-11 15:26:17 +08:00
  • 66cdf4ca4c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-11 15:06:09 +08:00