szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,864 Commits 13 Branches 41 Tags 242 MiB
Commit Graph

6864 Commits

Author SHA1 Message Date
YunaiV a19bd126e1 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-07 17:00:16 +08:00
YunaiV 2f49ad31f4 !124 【修复】分销用户绑定时判断是否为新用户逻辑错误问题 2024-07-07 11:07:21 +08:00
芋道源码 3d44c2f9e3
!1009 数据库 findInSet 兼容 
Merge pull request !1009 from 芋道源码/feature/db
 2024-07-07 01:32:51 +00:00
YunaiV f5ed040943 【代码优化】全局：数据库 findInSet 兼容 2024-07-07 09:31:27 +08:00
芋道源码 87c6c90a47
!1000 feat: FindInSetEnum、NameToTypeEnum 融合为DbTypeEnum 
Merge pull request !1000 from dhb52/feature/db
 2024-07-07 01:28:26 +00:00
YunaiV f1f2e24cde FIX_BUG controller.vm模版中的export-excel引用的Vo类没有加上sceneEnum.prefixClass前缀导致报错 2024-07-07 09:26:28 +08:00
YunaiV 0fa5cf1db6 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-07 09:24:46 +08:00
芋道源码 5325e9c506
!1004 FIX_BUG controller.vm模版中的export-excel引用的Vo类没有加上sceneEnum.prefixClass前缀导致报错 
Merge pull request !1004 from Syriana_Zh/N/A
 2024-07-07 01:24:34 +00:00
YunaiV 5d3bb791fd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
 2024-07-07 09:14:36 +08:00
YunaiV a0020f0339 修复主子表ERP模式下代码自动生成不全问题 #583 2024-07-07 09:13:42 +08:00
YunaiV 8d138cd1e9 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2024-07-07 09:11:46 +08:00
芋道源码 0337b1df68
Merge pull request #582 from jiushinakecai/com-dev 
Update mapper_sub.vm
 2024-07-07 09:11:04 +08:00
YunaiV 6a24025afa fix: 修复区域工具类单元测试 #585 2024-07-07 09:08:33 +08:00
芋道源码 ec480d142e
Merge pull request #585 from hunao0221/master 
fix: 修复区域工具类单元测试
 2024-07-07 09:02:31 +08:00
YunaiV 826a7e0ac0 【功能新增】AI：大模型相关的介绍 2024-07-06 20:08:12 +08:00
YunaiV 19407f6dce 【功能新增】AI：大模型相关的介绍 2024-07-06 20:06:56 +08:00
胡闹 167e4153fb
fix: 修复区域工具类单元测试 2024-07-02 10:58:46 +08:00
Syriana_Zh 5e8348dfca
FIX_BUG controller.vm模版中的export-excel引用的Vo类没有加上sceneEnum.prefixClass前缀导致报错 
Signed-off-by: Syriana_Zh <4916681+sairupe@user.noreply.gitee.com>
 2024-06-27 10:01:24 +00:00
就是那棵菜 7a42b3fab7
测试 
test
 2024-06-27 17:15:11 +08:00
就是那棵菜 47c8035dbc
Update mapper_sub.vm 
在“基础设施-代码生成”模块中，当选主子表ERP模式时，补充主表与子表一对一情况下需要生成的接口：default ${subTable.className}DO selectBy${SubJoinColumnName}
 2024-06-27 16:10:09 +08:00
dhb52 cc73fc8a91 fix: 调整 DbTypeEnum 字段顺序 2024-06-23 14:59:16 +08:00
dhb52 3c5309b14e feat: FindInSetEnum、NameToTypeEnum 融合为DbTypeEnum 2024-06-22 16:56:23 +08:00
YunaiV 7786233ae8 【修复】BPM：多租户使用同一个流程标识 key 时查询报错 2024-06-22 14:26:50 +08:00
YunaiV 355e47c371 【代码评审】Framework：find in set 代码 2024-06-22 10:52:42 +08:00
芋道源码 5f9d4b36a7
!994 feat: find_in_set函数的跨数据库实现 
Merge pull request !994 from dhb52/feature/db
 2024-06-22 02:47:09 +00:00
YunaiV e216849921 【修复】MEMBER：会员签到记录 Bug 2024-06-22 10:38:59 +08:00
芋道源码 fb459f0366
!984 修复会员签到记录bug 
Merge pull request !984 from 随便v走走/hotfix/member-sign-in-record-bug
 2024-06-22 02:36:59 +00:00
芋道源码 cd99a369e7
Merge pull request #563 from zhenxi-he/master 
【fix】ERP：采购金额计算逻辑错误
 2024-06-22 08:50:17 +08:00
YunaiV a5fbad31d1 【修复】ERP：采购金额计算逻辑错误 2024-06-22 08:50:12 +08:00
YunaiV 90ea7b951c 【修复】代码生成，Remove duplicate package imports 2024-06-22 08:48:25 +08:00
芋道源码 da815e8f9d
Merge pull request #562 from dengyumin/bugfix/yudao-module-infra-biz 
fix: Remove duplicate package imports
 2024-06-22 08:47:27 +08:00
YunaiV 48001c2b70 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2024-06-22 08:46:09 +08:00
芋道源码 17ff759553
Merge pull request #568 from DevDengChao/fix/disabled-user-login-via-sms 
fix: 修复被禁用的账户可以通过短信验证码再次登录的问题
 2024-06-22 08:45:56 +08:00
芋道源码 816a13ad72
Merge pull request #565 from dongdongxiang/master_jdk17_fix_page_v20240618 
修复 后台获取商品 SPU 分页列表数据时，数据会出现错乱问题。
 2024-06-22 08:39:28 +08:00
YunaiV 01b0866aa4 fix: 修改了函数名拼写 2024-06-22 08:37:06 +08:00
芋道源码 8dc20e2bc4
Merge pull request #571 from kokodayou2000/fix_functionName 
fix: 修改了函数名拼写
 2024-06-22 08:36:36 +08:00
DevDengChao e1f98c9777 chore: 使用 CommonStatusEnum.isDisable() 判断会员账户状态 2024-06-20 09:32:51 +08:00
kokodayou2000 792823198c fix: 修改了函数名拼写 2024-06-19 20:08:49 +08:00
dhb52 74efc60382 Merge branch 'feature/db' of gitee.com:zhijiantianya/ruoyi-vue-pro into feature/db 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-06-19 04:24:43 +00:00
YunaiV 6c7f1e8220 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db 
# Conflicts:
#	sql/tools/README.md
 2024-06-19 09:21:15 +08:00
dongdong.xiang 144bfb85a4 修复 后台获取商品 SPU 分页列表数据时，数据会出现错乱问题。 2024-06-18 22:07:58 +08:00
dhb52 ad03872844 doc: 更新测试数据库 docker 运行文档 2024-06-18 17:09:39 +08:00
dhb52 d49db8eaa8 feat: find_in_set函数的跨数据库实现 2024-06-18 16:59:54 +08:00
zhenxi-he cb1bf8c91a
Update ErpPurchaseReturnServiceImpl.java 2024-06-18 09:51:18 +08:00
zhenxi-he 3941e790b6
Update ErpPurchaseInServiceImpl.java 2024-06-18 09:50:14 +08:00
YunaiV 3da2449a15 【修复】SYSTEM：获取菜单精简信息列表接口没有排除父 ID 非 0 的节点 2024-06-18 09:20:49 +08:00
YunaiV cb73e7feb0 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2024-06-18 09:20:24 +08:00
芋道源码 ae9c5f7048
Merge pull request #561 from dongdongxiang/master_jdk17_fix_menu_v20240615 
【修复】获取菜单精简信息列表接口没有排除父 ID 非 0 的节点
 2024-06-18 09:20:08 +08:00
YunaiV 356291ca02 Merge branch 'master_jdk17_fix_menu_v20240615' of https://github.com/dongdongxiang/ruoyi-vue-pro into master-jdk17 2024-06-18 08:48:55 +08:00
dhb52 27e2996c5d Merge branch 'master-jdk17' into feature/db 
# Conflicts:
#	sql/tools/README.md
 2024-06-17 23:58:36 +08:00