lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
5,622 Commits 2 Branches 0 Tags 165 MiB
7506a1b012
Commit Graph

5622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
7506a1b012 sms：移除 sendCode、sendMsg 字段 2023-11-21 22:53:57 +08:00
YunaiV
6f135303d8 sms：移除 SmsCodeMapping + SmsCommonResult，简化短信的封装 2023-11-21 22:14:07 +08:00
YunaiV
827897807f 提升启动速度 2023-11-19 18:46:16 +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
芋道源码
667957c941
!737 【修改】最新的SQL字符编码不一致导致创建表失败，修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 
Merge pull request !737 from souvc/master
 2023-11-18 16:57:03 +00:00
芋道源码
867293a4f9
!724 会员中心商品收藏 
Merge pull request !724 from niou233/feature/mall_product_org
 2023-11-18 16:40:00 +00:00
YunaiV
6270975902 优化启动速度 2023-11-19 00:37:30 +08:00
芋道源码
7e1ffcbc0c
!738 同步部分 CRM 的实现 
Merge pull request !738 from 芋道源码/feature/crm
 2023-11-18 16:35:45 +00:00
YunaiV
f589881de5 code review：客户的分配和领取 2023-11-19 00:05:06 +08:00
YunaiV
e519b41244 Merge branch 'feature/crm' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2023-11-18 23:56:08 +08:00
YunaiV
86050d411b code review：权限模块 2023-11-18 23:45:24 +08:00
liuhongfeng
58ede7d69c 【修改】最新的SQL字符编码不一致导致创建表失败，修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 2023-11-18 23:30:24 +08:00
YunaiV
716b081464 crm：合并最新的数据权限 2023-11-18 22:31:05 +08:00
YunaiV
8c9873c425 Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
 2023-11-18 22:25:13 +08:00
YunaiV
8c9c91f0ca crm：code review 配置管理 2023-11-18 22:12: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
YunaiV
966690125b crm：code review 联系人 2023-11-18 20:43:32 +08:00
芋道源码
bf8bfef8cb
!727 crm联系人字段修改 
Merge pull request !727 from zyna/feature/crm
 2023-11-18 12:12:08 +00:00
芋道源码
a440b354ba
!735 商城装修 
Merge pull request !735 from 疯狂的世界/feature/mall_product
 2023-11-18 11:25:05 +00:00
芋道源码
29ff418091
!736 新增主子表、树表的代码生成 
Merge pull request !736 from 芋道源码/feature/sub-table
 2023-11-18 09:57:59 +00:00
YunaiV
7ac74b44d8 同步最新 SQL 脚本 2023-11-18 17:49:01 +08:00
YunaiV
ac80aa97b3 代码生成：优化前端模版的 package 路径 2023-11-18 17:41:37 +08:00
zhijiantianya@gmail.com
067d53ac48 代码生成器：增加单元测试，🛫 2023-11-17 19:39:32 +08:00
YunaiV
ee918a6d3f 代码生成：增加主子表 erp 模式的示例 2023-11-17 13:21:07 +08:00
owen
330380c2d0 营销：适配商城装修组件【商品卡片】 2023-11-17 09:56:52 +08:00
YunaiV
d2aee55ed2 代码生成：增加主子表 inner 模式的示例 2023-11-16 23:48:12 +08:00
YunaiV
2aecdbf09e 代码生成：增加主子表 normal 模式的示例 2023-11-16 23:23:46 +08:00
YunaiV
5b9879ca8d 代码生成：增加 tree 示例 2023-11-16 20:40:13 +08:00
YunaiV
01a55b93c2 代码生成：增加更全的 tree 场景下的新增/修改校验 2023-11-16 20:01:44 +08:00
YunaiV
f5ea270be3 部门：优化父部门的校验逻辑，为代码生成做个铺垫？！ 2023-11-16 12:55:43 +08:00
YunaiV
a2f7067494 代码生成：支持树形表结构的配置 2023-11-16 00:11:31 +08:00
YunaiV
0d49691aa0 代码生成：增加 crud 单表示例 2023-11-15 23:48:30 +08:00
YunaiV
d83e0413b8 清理一波 demo 示例代码，准备重新生成 2023-11-15 21:46:10 +08:00
zhijiantianya@gmail.com
413640f593 代码生成器：简化 vo 和 convert 的生成逻辑 2023-11-15 21:05:00 +08:00
zhijiantianya@gmail.com
91d7938ddf 代码生成器：简化 vo 和 convert 的生成逻辑 2023-11-15 21:03:16 +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
zhijiantianya@gmail.com
b47c4fbd8d 代码生成器：增加树形结构的 vm 模版 2023-11-14 19:37:35 +08:00
YunaiV
06649624e5 代码生成：支持设置主子表的信息 2023-11-14 12:57:55 +08:00
puhui999
794649ea8a CRM-数据权限：完善团队成员相关操作 2023-11-14 11:23:52 +08:00
YunaiV
a75bb825d7 代码生成：支持设置主子表的信息 2023-11-14 09:51:10 +08:00
YunaiV
a51e9645ef 代码生成：进一步完成 erp 模版 2023-11-13 21:46:54 +08:00
zhijiantianya@gmail.com
7c48aaba8a 代码生成器：进一步完善 erp 生成模版 2023-11-13 20:37:15 +08:00
zhijiantianya@gmail.com
01bdb33696 代码生成器：进一步完善 erp 生成模版 2023-11-13 20:35:03 +08:00
YunaiV
90842542a9 代码生成：主子表（inner）部分模版 2023-11-13 13:57:31 +08:00