Merge remote-tracking branch 'origin/main'

2 years ago · 9782dcc6ea
parent c7d1d7b2b7 a8d7fd3f50
commit 9782dcc6ea
1 changed files with 3 additions and 2 deletions
--- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/agricultural/AgriculturalMapper.xml
+++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/agricultural/AgriculturalMapper.xml
@ -15,7 +15,8 @@
            id,
            agricultural_name AS agriculturalName,
            manufacturer,
-            agricultural_unit AS agriculturalUnit
+            agricultural_unit AS agriculturalUnit,
+            agricultural_type AS agriculturalType
        FROM
            traceability_agricultural
        WHERE
@ -23,4 +24,4 @@
          AND agricultural_status = 1
          AND husbandry_id = #{husbandryId}
    </select>
-</mapper>
+</mapper>