boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java
This commit is contained in:
达富斌
2025-08-26 00:19:20 +08:00
parent 99c7964486 1f6f186df6
commit 2b8b1cdf94
6 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml
View File

@@ -46,8 +46,6 @@
SELECT field1_code, field1_name, field2_name, field2_code, field3_code, field3_name
FROM farm_sys_dict
<include refid="where_3"/>
DESC LIMIT 1
</select>
<sql id="where_3">