Commit Graph

Select branches

Hide Pull Requests

feat/questionnaire-task-management

main

master

master-jdk17

#6

Mono Color

• 19d5a0c2aa 📖 CRM：code review crm 联系人新增操作日志 YunaiV 2024-01-07 18:19:08 +08:00
• 450cd1baf1
  !817 crm联系人新增操作日志 Merge pull request !817 from zyna/develop 芋道源码 2024-01-07 08:27:28 +00:00
• bbba83ef61 📖 MALL：code review 商品统计的代码 YunaiV 2024-01-07 16:23:02 +08:00
• eb048532f7 Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop YunaiV 2024-01-06 21:52:10 +08:00
• 44d828023c crm联系人新增操作日志 zyna 2024-01-06 21:06:38 +08:00
• a259e032e1 ✨ MALL：增加商品列表的分类编号数组、商品编号的筛选 YunaiV 2024-01-06 20:42:32 +08:00
• 68f5edaa88 CRM-客户: 完善一些 TODO puhui999 2024-01-06 15:28:10 +08:00
• 3170e7fd97 CRM-客户: 简化客户公海配置 VO，完善相关操作日志 puhui999 2024-01-06 13:48:22 +08:00
• 9ce50ec369 CRM-客户限制配置：VO 简化 puhui999 2024-01-06 13:04:30 +08:00
• 269816446a CRM-客户：日志表达式调整 puhui999 2024-01-06 12:27:30 +08:00
• f73cb540cf ✨ MALL：去除分销提现的银行配置 YunaiV 2024-01-05 22:46:35 +08:00
• a1c17b9b00 CRM-客户：日志表达式调整 puhui999 2024-01-05 17:40:21 +08:00
• 9203f485e9 Merge remote-tracking branch 'origin/develop' into develop owen 2024-01-05 15:40:29 +08:00
• d8bb55fc0b CRM-客户：完善操作日志 puhui999 2024-01-05 14:43:48 +08:00
• 1ae535fc87 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-01-05 01:31:14 +08:00
• 1ef3998cfa Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2024-01-05 01:30:29 +08:00
• 3091a0882f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-01-05 01:29:57 +08:00
• ee250c74d6 ✨ MALL：更新 uni-app + Vue3 实现 YunaiV 2024-01-05 01:28:39 +08:00
• ea4b4b8956 CRM-客户：精简 VO puhui999 2024-01-05 00:15:26 +08:00
• e6f4c1f0d5 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-01-04 09:59:50 +08:00
• a974d055b6 📖 CRM：【还款】code review 还款的代码，补全对应的 todo list YunaiV 2024-01-04 09:41:58 +08:00
• c6a9751511 📖 CRM：【合同】code review 合同的代码，补全对应的 todo list YunaiV 2024-01-04 09:18:44 +08:00
• 2668e0cfeb 📖 CRM：【产品】code review 产品的代码，补全对应的 todo list YunaiV 2024-01-04 08:01:04 +08:00
• b9f1e8ffaf 📖 CRM：【联系人】code review 商机的代码，补全对应的 todo list YunaiV 2024-01-04 07:53:00 +08:00
• 9e895c8af1
  修复订单操作日志中快递公司名称模板与数据对不上的问题 cn.iocoder.yudao.module.trade.enums.order.TradeOrderOperateTypeEnum中ADMIN_DELIVERY为deliveryName 杨宇庆 2024-01-03 18:50:23 +00:00
• 02324f9e60 ✨ CRM：【联系人】统一字段 YunaiV 2024-01-03 23:30:25 +08:00
• cff6e520ee 📖 CRM：【联系人】code review 联系人的代码，补全对应的 todo list YunaiV 2024-01-03 22:07:20 +08:00
• f8f5e525be ✨ CRM：新增跟进记录表 YunaiV 2024-01-03 20:56:28 +08:00
• 2e7c3e09a9 📖 CRM：code review 所有代码，补充对应 todo YunaiV 2024-01-03 19:38:13 +08:00
• d0df0e8e16 📖 CRM：【客户】优化锁定客户的逻辑实现 YunaiV 2024-01-03 13:06:49 +08:00
• e18ac461ea fix: 修复公众号模块，当粉丝第一次关注的时候会出现错误（公众号粉丝不存在） puhui999 2024-01-03 11:11:20 +08:00
• 90bdc1fd83 fix: 修复公众号统计接口字符串日期转 localDateTime 报错的问题 puhui999 2024-01-03 10:09:41 +08:00
• 0253846fdf Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop YunaiV 2024-01-02 22:21:14 +08:00
• 1da8006af3 📖 CRM：【客户】完善列表、新增、修改接口的 todo YunaiV 2024-01-02 21:45:02 +08:00
• 9e3055ee1e 📖 CRM：code review 商机模块 YunaiV 2024-01-02 18:49:14 +08:00
• 39d26cc84d 会员当前有等级的时候下订单会把当前等级清空得bug修复 yunlongn 2024-01-02 15:32:16 +08:00
• 2d0537387b Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop YunaiV 2023-12-30 21:43:04 +08:00
• 8c9b483ac5 📖 code review 操作日志的实现 YunaiV 2023-12-30 21:36:46 +08:00
• 9c3cf1d6b6
  !806 操作日志：完善 code review 提到的问题 Merge pull request !806 from puhui999/develop 芋道源码 2023-12-30 12:14:40 +00:00
• 290f45dd6e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop YunaiV 2023-12-30 20:11:07 +08:00
• 6c0978407b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-30 19:23:35 +08:00
• 8a947990f4 🐛 升级 easyexcel 依赖，解决 JDK21 导出报错 YunaiV 2023-12-30 19:22:58 +08:00
• 63e3bcce60 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2023-12-30 13:14:01 +08:00
• 5946bddff8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-30 13:13:21 +08:00
• a98d00a7fe Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-30 12:01:25 +08:00
• 2fb36563ec 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 YunaiV 2023-12-30 12:01:12 +08:00
• 81c726542b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-30 11:24:15 +08:00
• 51968c4c19 🐛 腾讯云上传 bug YunaiV 2023-12-30 11:23:59 +08:00
• e35b8c45a0 🐛 REPORT：支持 SaaS 租户模式 YunaiV 2023-12-30 10:38:53 +08:00
• baabebb5d1 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-30 10:31:39 +08:00
• 078ead536b 🐛 REPORT：支持 SaaS 租户模式 YunaiV 2023-12-30 10:30:47 +08:00
• be0e0f5d71 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-30 09:38:13 +08:00
• 9a03f1a796 🐛 BPM：多租户的工作流隔离 YunaiV 2023-12-30 09:38:01 +08:00
• cd7da1b3a2 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 23:51:51 +08:00
• e10d831117 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2023-12-29 23:50:08 +08:00
• 2ede505987 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 22:35:26 +08:00
• c48e0b9f48 Merge remote-tracking branch 'origin/master' YunaiV 2023-12-29 22:34:50 +08:00
• b5e19c63f7
  !799 解决审批流自定义脚本无法获取流程变量 Merge pull request !799 from xiuuuu/master-jdk21 芋道源码 2023-12-29 14:34:06 +00:00
• c38790655f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 22:33:40 +08:00
• d31a12aff7 🐛 修改了支付 demo 退款单匹配错误问题 YunaiV 2023-12-29 22:33:26 +08:00
• 8dc56cc3f5
  !800 修改了支付demo退款单匹配错误问题 Merge pull request !800 from lynfgn/master 芋道源码 2023-12-29 14:30:54 +00:00
• 53a64272b9
  !804 代码生成器Vue2，Excel导出下载修复 Merge pull request !804 from virtuecai/master 芋道源码 2023-12-29 14:27:21 +00:00
• b0857aedbc 🐛 修复 ExcelUtils 报错 YunaiV 2023-12-29 22:23:07 +08:00
• f0fd0c6677 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 22:21:45 +08:00
• 8de2eea1f7 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 22:21:11 +08:00
• ed1b55fed7 🐛 文件路径 url 中文解码问题 YunaiV 2023-12-29 22:20:59 +08:00
• b1be080e2f
  !807 文件路径url中文解码问题 Merge pull request !807 from ccran/master 芋道源码 2023-12-29 14:19:48 +00:00
• 6d5fe962b7 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 21:53:03 +08:00
• 0f6f204320 🐛 修改 pay 模块>支付订单的同步 Job，查询指定创建时间前的待支付订单 YunaiV 2023-12-29 21:52:49 +08:00
• 06977644ce
  !808 修改`pay 模块>支付订单的同步 Job，查询指定创建时间前的待支付订单 Merge pull request !808 from 骑士梦/qs 芋道源码 2023-12-29 13:50:18 +00:00
• ff162e9c6c Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 21:45:55 +08:00
• 475e932aec 🐛 导出 Excel:Long 类型 ID 会丢失精度 YunaiV 2023-12-29 21:45:43 +08:00
• 039a2b1278 支付订单的同步 Job，查询指定创建时间前的待支付订单 wy 2023-12-29 16:47:28 +08:00
• 29405b9e41 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 12:59:31 +08:00
• 0861372755 🐛 修复修改短信渠道缓存没有更新 YunaiV 2023-12-29 12:59:20 +08:00
• bc93325b9e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 12:55:11 +08:00
• 829965e50a 🐛 fix(websocket): 修复 websocket 失效的问题 YunaiV 2023-12-29 12:54:52 +08:00
• 46e60d6b0a Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-12-29 12:49:13 +08:00
• 08ff391f78 🐛 Websocket 断开时，未删除会话缓存 bug YunaiV 2023-12-29 12:48:36 +08:00
• 33c3686bef ✨ MALL：合并订单和售后订单的数量接口 YunaiV 2023-12-28 23:15:25 +08:00
• 1f3f3d789b ✨ MALL：营销文章增加 title 查询，简易解决常见问题、用户协议的编辑 YunaiV 2023-12-27 22:07:54 +08:00
• c019136f07 ✨ Member：增加积分记录的时间筛选 YunaiV 2023-12-27 20:39:14 +08:00
• a1ee0991f1 fix:文件路径url中文解码 ccran 2023-12-27 12:52:49 +08:00
• e5377074d5 数据权限：完善 code review 提到的问题 puhui999 2023-12-26 00:21:04 +08:00
• 6950368991 操作日志：完善 code review 提到的问题 puhui999 2023-12-26 00:04:20 +08:00
• 2f5afdb5c9 ✨ Member：增加使用微信小程序 code 绑定手机号 YunaiV 2023-12-25 23:33:50 +08:00
• 5de6a8bd23 📖 code review：操作日志的实现 YunaiV 2023-12-25 21:40:16 +08:00
• 82a25474f6 Merge remote-tracking branch 'origin/develop' into develop YunaiV 2023-12-25 08:43:38 +08:00
• 7542b6a78d ✨ Member：完善微信相关配置 YunaiV 2023-12-25 08:43:32 +08:00
• 525d41bad1
  !805 重构操作日志记录实现；CRM-数据权限：完善数据权限补全管理员和公海相关情况处理逻辑 Merge pull request !805 from puhui999/develop 芋道源码 2023-12-25 00:42:51 +00:00
• 7286f33a7f Merge remote-tracking branch 'yudao/develop' into develop puhui999 2023-12-24 00:32:47 +08:00
• 60e684c455 营销活动：获取商品近期参与的每个活动新增满减送和限时折扣活动 puhui999 2023-12-24 00:32:17 +08:00
• bd5c7d57dc ✨ Member：社交（三方）绑定接口，增加 openid 返回 YunaiV 2023-12-23 22:54:20 +08:00
• 7b482f5729 ✨ Member：增加获取单个社交用户的接口 YunaiV 2023-12-23 21:48:33 +08:00
• e8ade5f1fe crm：完善一些遗留的 TODO puhui999 2023-12-23 20:10:40 +08:00
• 59752d43b7 ✨ Member：修复社交登录时，自动创建 user 后，未进行绑定的问题 YunaiV 2023-12-23 17:54:13 +08:00
• d65c28d7f7 ✨ Member：社交登录逻辑调整，如果登录时无用户，则自动创建用户，保持和各 App 统一逻辑 YunaiV 2023-12-23 09:59:58 +08:00
• 106c1ecf4c 📖 code review：店铺装修逻辑 YunaiV 2023-12-19 23:11:09 +08:00
• 0944584029 商品：用户未登录时，不记录商品浏览记录 owen 2023-12-19 21:44:04 +08:00
• a05d3bc1d1 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2023-12-19 18:44:34 +08:00