Commit Graph

917 Commits

Author SHA1 Message Date
YunaiV
6f135303d8 sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装 2023-11-21 22:14:07 +08:00
YunaiV
e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
2023-11-19 18:39:55 +08:00
YunaiV
7f75f0abfc bpm:code review 指定审批人 2023-11-19 18:28:00 +08:00
YunaiV
6fd8d0095c Merge branch 'feature/bpm-earlyAssignee' of https://gitee.com/ykhcool/ruoyi-vue-pro 2023-11-19 18:17:28 +08:00
YunaiV
c7a21b2a64 mall:优化商品收藏的分页接口 2023-11-19 00:58:12 +08:00
YunaiV
90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/crm.sql
2023-11-18 21:17:11 +08:00
YunaiV
5122aee924 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/views/system/user/index.vue
2023-11-18 20:44:06 +08:00
zhijiantianya@gmail.com
067d53ac48 代码生成器:增加单元测试,🛫 2023-11-17 19:39:32 +08:00
zhijiantianya@gmail.com
7e6b084f77 Merge branch 'feature/vo-optimize' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2023-11-15 21:02:22 +08:00
YunaiV
5e6e02e4f4 vo 简化:使用 BeanUtils 替代 mapstruct 转换 2023-11-15 09:19:51 +08:00
YunaiV
ddb5bce0a2 vo 简化:post 重构 2023-11-14 22:37:46 +08:00
YunaiV
06649624e5 代码生成:支持设置主子表的信息 2023-11-14 12:57:55 +08:00
YunaiV
256c560d43 代码生成:增加主子表的示例 2023-11-12 22:33:18 +08:00
Wanwan
5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
YunaiV
055eb350aa 代码生成:简化现有 crud 模版的各种 pretty 相关的判断,交给 Java 代码后置统一处理。 2023-11-11 12:56:58 +08:00
YunaiV
01b62a9b0c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2023-11-08 22:29:31 +08:00
zhijiantianya@gmail.com
2f6456e2b0 代码生成器:主子表,支持多个从字段 50% 2023-11-08 21:00:34 +08:00
niou233
cbaadc3a77 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_org 2023-11-08 14:39:01 +08:00
niou233
daa7d14b09 reafactor: 会员商品收藏 2023-11-08 14:36:44 +08:00
YunaiV
2afc2caf1d 代码生成:主子表的部分实现 2023-11-08 09:42:16 +08:00
jason
4ae3d34801 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-07 23:11:25 +08:00
jason
15313c2992 转账 - 增加转账定时任务 2023-11-07 23:11:07 +08:00
YunaiV
9762a2a7c3 优化:默认只引入 mysql driver,减少打包大小 2023-11-06 21:17:27 +08:00
YunaiV
c162b39e1e 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
kehaiyou
9537669d01 fix: 去除无用行 2023-11-05 20:14:21 +08:00
kehaiyou
ca184026cf feat: 创建流程实例时,提前指派审批人 2023-11-05 14:21:37 +08:00
kehaiyou
b400aaac36 Merge remote-tracking branch 'upstream/master' 2023-11-05 13:26:38 +08:00
YunaiV
787de1be94 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
2023-11-04 20:48:27 +08:00
YunaiV
5bb91f139e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-11-03 23:34:37 +08:00
owen
bdfb5b8894 营销:装修页面适配 2023-11-03 09:18:04 +08:00
YunaiV
c886e7eff2 mq:增加 Rabbitmq 教程内容 2023-11-02 20:18:45 +08:00
YunaiV
20725e3dfd mq:增加 rabbitmq 配置项 2023-11-02 08:22:05 +08:00
YunaiV
b8d5a665be mq:增加 rocketmq 配置项 2023-11-02 00:07:38 +08:00
YunaiV
e1c34e9124 mq:优化 redis stream 的命名 2023-11-01 22:46:02 +08:00
zhijiantianya@gmail.com
f8ed0e15f0 mq:增加 kafka、rocketmq、rabbitmq 的实现支持 2023-11-01 19:58:56 +08:00
dongshanshan
98aae5ed1a feat: 会员商品收藏 2023-10-31 16:51:56 +08:00
YunaiV
c066ea46f9 mq 重构:默认的 redis 实现:
1)默认 channel 和 stream key
2)移除 enabled 开关,通过 listener 是否存在来实现
3)调整包名,为接入 rocketmq 作为 mq 实现做准备
2023-10-30 21:15:22 +08:00
jason
ccccd9f226 转账 - 转账代码修改,新增转账示例 2023-10-29 23:36:06 +08:00
YunaiV
0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 14:25:38 +08:00
jason
5f29399cf4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-25 23:42:25 +08:00
jason
626bd0bd55 转账 - code review 修改 2023-10-25 23:41:59 +08:00
YunaiV
52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
2023-10-24 19:09:01 +08:00
YunaiV
dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
YunaiV
d9a5ef3321 统一 boot 和 cloud 代码 2023-10-24 13:58:35 +08:00
jason
86598dd177 转账 - 动态收款人字段修改 2023-10-24 08:44:30 +08:00
puhui999
6723cae781 营销活动:完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV
d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-10-22 08:25:27 +08:00
YunaiV
9697aee898 code review:钱包的逻辑 2023-10-21 21:17:49 +08:00
YunaiV
3bb3e4caf6 code review:工作流的加减签 2023-10-21 21:04:20 +08:00
kehaiyou
aca65a66b5 feat: 【工作流】--加减签review修改 2023-10-21 18:16:21 +08:00