Commit Graph

6402 Commits

Author SHA1 Message Date
ljlleo
bee6f41211 商机 2023-10-20 16:01:54 +08:00
puhui999
6e11154010 SPU: 添加选择优惠卷 2023-10-20 11:35:16 +08:00
YunaiV
52ebcaaad7 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/ 2023-10-20 00:31:35 +08:00
YunaiV
6c8e82ca5a code review:自提统计 2023-10-20 00:30:27 +08:00
芋道源码
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
YunaiV
453f69931f code review:营销文章 2023-10-19 23:41:39 +08:00
YunaiV
64b842ed94 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 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
YunaiV
f8e4aece31 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-10-19 23:31:21 +08:00
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
439edcd1be code review:crm 线索的 crud 2023-10-19 23:15:18 +08:00
wanwan
48661f980c !679 feat: CRM 线索表 crud
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
2023-10-19 14:52:16 +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
913752709@qq.com
1b6c8574cd feat: CRM 线索表 crud 2023-10-18 20:02:53 +08:00
913752709@qq.com
a09ee495b6 feat: CRM 线索表 crud 2023-10-18 19:53:15 +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
YunaiV
b133acd8cd code review:crm 合同流程 2023-10-17 22:52:14 +08: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
芋道源码
07f3d09e38
!671 CRM/合同管理 CRUD初稿
Merge pull request !671 from dhb52/feature/crm
2023-10-17 12:02:20 +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
dhb52
164be5732b feat: CRM/合同管理 - SQL 2023-10-16 23:53:27 +08:00
dhb52
eedb528412 feat: CRM/合同管理 - crud 2023-10-16 23:53:17 +08:00
dhb52
e26bd20a5b feat:添加测试配置及excel依赖 2023-10-16 23:45:18 +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