github/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2026-04-25 07:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/yudao/master-jdk17' into vben5-antd-schema

Browse Source 
# Conflicts:
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java
This commit is contained in:
puhui999
2025-05-20 16:10:46 +08:00
parent b9ffa1820d 0c68962a97
commit c320b525b5
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-infra/src/main/resources/codegen/java/dal/do.vm
View File

@@ -78,6 +78,7 @@ public class ${table.className}DO extends BaseDO {
#end
#end
## 特殊：主子表专属逻辑（非 ERP 模式）
## TODO @puhui999：这里空行看看，会不会多了一个哈
#if ( $voType == 20 && $subTables && $subTables.size() > 0 && $table.templateType != 11 )
#foreach ($subTable in $subTables)
#set ($index = $foreach.count - 1)