besure_server

Commit Graph

Select branches

Hide Pull Requests

ck

hhk

liutao_branch

main

plp

#1

728308cbc0 member：优化部分变量的命名 YunaiV 2023-10-22 16:35:48 +0800
94c2ad5d1d 修复报错的单元测试 YunaiV 2023-10-22 08:55:27 +0800
d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-10-22 08:25:27 +0800
ec27a1bae5 修复报错的单元测试 YunaiV 2023-10-22 08:24:47 +0800
55f9e0131c code review：CRM 客户联系人的管理 YunaiV 2023-10-21 22:20:00 +0800
723707c7ed Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm YunaiV 2023-10-21 22:13:34 +0800
b5560fa0be code review：CRM 线索表的逻辑 YunaiV 2023-10-21 22:05:37 +0800
9cf4cfca86 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm YunaiV 2023-10-21 22:00:15 +0800
f942e2c7f2 code review：CRM 回款计划的逻辑 YunaiV 2023-10-21 21:55:21 +0800
56b59cf383 Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm YunaiV 2023-10-21 21:41:16 +0800
6f8fd383f7 code review：CRM 商机的逻辑 YunaiV 2023-10-21 21:35:35 +0800
24e6deb82b

!682 商机 Merge pull request !682 from 刘先生/feature/crm 芋道源码 2023-10-21 13:19:46 +0000
9697aee898 code review：钱包的逻辑 YunaiV 2023-10-21 21:17:49 +0800
3bb3e4caf6 code review：工作流的加减签 YunaiV 2023-10-21 21:04:20 +0800
cc67174f87

!689 【工作流】--加签减签review Merge pull request !689 from Youkehai/feature/bpm-addSignAndSubSign 芋道源码 2023-10-21 11:59:22 +0000
0db4581030 code review：签到逻辑 YunaiV 2023-10-21 19:56:53 +0800
3e570b8b89

!685 完善遗留的问题 Merge pull request !685 from puhui999/feature/mall_product 芋道源码 2023-10-21 11:31:56 +0000
6dfef29834 feat: 控制查找子任务次数和清除递归代码 kehaiyou 2023-10-21 18:31:30 +0800
aca65a66b5 feat: 【工作流】--加减签review修改 kehaiyou 2023-10-21 18:16:21 +0800
785fbeeb5b code review：限时折扣活动 YunaiV 2023-10-21 18:16:09 +0800
90fb2c62b8

!683 mall模块 Merge pull request !683 from zxiaoxiu/discount 芋道源码 2023-10-21 09:23:50 +0000
0e754a9924 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-21 17:09:24 +0800
f363c598d8 Banner：完善 review 提到的问题 puhui999 2023-10-21 17:09:04 +0800
89e847c8cd 钱包，转账 review 修改 jason 2023-10-21 15:28:07 +0800
1bb2010dc0 签到记录：完善 review 提到的问题 puhui999 2023-10-21 01:11:10 +0800
2f7371b4ea 签到记录：完善 review 提到的问题 puhui999 2023-10-21 01:01:06 +0800
e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 913752709@qq.com 2023-10-21 00:53:18 +0800
435d7dcfca Merge remote-tracking branch 'origin/feature/crm' into feature/crm 913752709@qq.com 2023-10-21 00:09:44 +0800
34a5785768 【新增】回款计划功能 liuhongfeng 2023-10-20 23:48:19 +0800
e4943f0dfa crm联系人 zyna 2023-10-20 23:42:22 +0800
db0fbf0596 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-20 23:22:16 +0800
183206e2d3 转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式 jason 2023-10-20 23:20:47 +0800
f18a4741a9 营销活动：完善 review 提到的问题 puhui999 2023-10-20 22:32:37 +0800
73f4fc8ceb 【新增】回款管理功能 liuhongfeng 2023-10-20 22:16:34 +0800
f462ac7f96 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-20 21:04:47 +0800
04061b028c mall模块-限时折扣功能 zhangshuai 2023-10-20 20:54:16 +0800
283ca908b7 SPU: 完善选择优惠卷 puhui999 2023-10-20 16:35:49 +0800
01490c879c 商机sql ljlleo 2023-10-20 16:14:45 +0800
bee6f41211 商机 ljlleo 2023-10-20 16:01:54 +0800
6e11154010 SPU: 添加选择优惠卷 puhui999 2023-10-20 11:35:16 +0800
52ebcaaad7 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/ YunaiV 2023-10-20 00:31:35 +0800
6c8e82ca5a code review：自提统计 YunaiV 2023-10-20 00:30:27 +0800
8bd1942083

!676 交易：核销订单 Merge pull request !676 from 疯狂的世界/feature/mall_product 芋道源码 2023-10-19 15:59:00 +0000
3590336b1c

!677 基础设施：数据库文档增加忽略前端FLW_ Merge pull request !677 from 疯狂的世界/pr/infra 芋道源码 2023-10-19 15:52:56 +0000
453f69931f code review：营销文章 YunaiV 2023-10-19 23:41:39 +0800
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 +0800
e21422d119

!678 营销活动：完善 review 提到的问题 Merge pull request !678 from puhui999/feature/mall_product 芋道源码 2023-10-19 15:31:36 +0000
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 +0800
14f006088a code review：敏感词 YunaiV 2023-10-19 23:25:17 +0800
630890d0ac

!665 修复敏感词单字符检验失败问题 Merge pull request !665 from 摸鱼散人/master 芋道源码 2023-10-19 15:18:31 +0000
439edcd1be code review：crm 线索的 crud YunaiV 2023-10-19 23:15:18 +0800
48661f980c !679 feat: CRM 线索表 crud * feat: CRM 线索表 crud * feat: CRM 线索表 crud wanwan 2023-10-19 14:52:16 +0000
979b484d7f saas：支持社交应用的多租户配置（wx 小程序） YunaiV 2023-10-19 21:42:39 +0800
6f757e5297 saas：支持社交应用的多租户配置（mp） YunaiV 2023-10-19 12:54:44 +0800
d256275099 saas：支持社交应用的多租户配置 YunaiV 2023-10-18 23:48:14 +0800
1b6c8574cd feat: CRM 线索表 crud 913752709@qq.com 2023-10-18 20:02:53 +0800
a09ee495b6 feat: CRM 线索表 crud 913752709@qq.com 2023-10-18 19:53:15 +0800
00e18a480f code review：钱包、充值、转账的实现 zhijiantianya@gmail.com 2023-10-18 18:39:05 +0800
ffbf9278b8 营销文章：修正文章浏览量类型错误，新增时初始化浏览量 puhui999 2023-10-18 11:27:14 +0800
6081ce30d5 营销活动：完善 review 提到的问题 puhui999 2023-10-18 11:09:20 +0800
2f69389982 基础设施：数据库文档增加忽略前端FLW_ owen 2023-10-18 09:46:24 +0800
0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-17 23:29:11 +0800
5842a361e2 同步最新 SQL 脚本 YunaiV 2023-10-17 23:23:17 +0800
0612a13cce 交易：核销订单 owen 2023-10-17 23:18:08 +0800
ee1d5c7e60

!675 线上修改文件管理->文件配置->更换主配置导致文件上传报错 Merge pull request !675 from 人生三两事/master 芋道源码 2023-10-17 15:14:52 +0000
b133acd8cd code review：crm 合同流程 YunaiV 2023-10-17 22:52:14 +0800
43985bff93 逻辑错误。已缓存master时，修改master会因为id不匹配config导致引用错误的FileClient实现类 lan 2023-10-17 22:01:34 +0800
4b0333f3e9 code review：订单统计 zhijiantianya@gmail.com 2023-10-17 20:42:22 +0800
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 +0800
3c6c8aab01

!672 Review代码修改 Merge pull request !672 from 疯狂的世界/feature/mall_product 芋道源码 2023-10-17 12:28:47 +0000
07f3d09e38

!671 CRM/合同管理 CRUD初稿 Merge pull request !671 from dhb52/feature/crm 芋道源码 2023-10-17 12:02:20 +0000
0af205ede1 Merge remote-tracking branch 'origin/master' zhijiantianya@gmail.com 2023-10-17 18:49:59 +0800
c629fd2208 code review：工作流逻辑 zhijiantianya@gmail.com 2023-10-17 18:49:35 +0800
b1e0129046 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-17 16:13:46 +0800
5e65512a92 交易：订单核销 owen 2023-10-17 16:09:37 +0800
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 +0800
164be5732b feat: CRM/合同管理 - SQL dhb52 2023-10-16 23:53:27 +0800
eedb528412 feat: CRM/合同管理 - crud dhb52 2023-10-16 23:53:17 +0800
e26bd20a5b feat:添加测试配置及excel依赖 dhb52 2023-10-16 23:45:18 +0800
d842708c23 code review：数据统计 YunaiV 2023-10-16 23:42:54 +0800
d2112458d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-10-16 22:51:28 +0800
1ff9bc6a71 code review：文章管理 YunaiV 2023-10-16 22:51:19 +0800
34210d3534 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-16 22:43:54 +0800
7d0bcf5d3b wallet - 管理端钱包余额菜单脚本 jason 2023-10-16 22:43:39 +0800
b89ae001ad 统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 owen 2023-10-16 22:09:20 +0800
7aa1ecceeb 统计：Review修改 owen 2023-10-16 22:03:37 +0800
cebdc190b6

!668 营销活动：完善文章相关 app 端接口，完善 review 提到的问题 Merge pull request !668 from puhui999/feature/mall_product 芋道源码 2023-10-16 13:55:47 +0000
6fbb7d6d6d 终端类型参数改为从Controller传入 owen 2023-10-16 21:01:01 +0800
b6e63e885d code review：商城统计 zhijiantianya@gmail.com 2023-10-16 20:01:25 +0800
4273b8f09c 营销活动：完善 review 提到的问题 puhui999 2023-10-16 18:53:25 +0800
01ef5f7911 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-16 17:47:17 +0800
1502159608

!669 商城首页 Merge pull request !669 from 疯狂的世界/feature/mall_product 芋道源码 2023-10-16 09:33:22 +0000
76f512fc7a 1. APP增加终端Header[terminal] 2. 订单、会员注册记录来源终端 owen 2023-10-16 15:06:59 +0800
b6d400e04a 统计：会员终端统计接口实现 owen 2023-10-16 14:23:53 +0800
6f08645f61 会员：增加字段【注册终端】 owen 2023-10-16 14:22:43 +0800
d3385dcb4f 统计：会员分析数据接口重构 owen 2023-10-16 13:52:00 +0800
8e35a786ba 统计：处理会员性别统计，存在未知的情况 owen 2023-10-16 13:25:15 +0800
4f731e9904 统计：处理会员地区统计，存在未知省份的情况 owen 2023-10-16 13:20:11 +0800
bb82c631e9 统计：Review修改 owen 2023-10-16 13:00:14 +0800
ea810bb5d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-16 10:02:04 +0800

Commit Graph Select branches Hide Pull Requests ck hhk liutao_branch main plp #1 Mono Color

Commit Graph

Select branches

Hide Pull Requests

ck

hhk

liutao_branch

main

plp

#1