diff --git a/private-farm/src/main/java/com/jlt/csa/domain/FarmerContract.java b/private-farm/src/main/java/com/jlt/csa/domain/FarmerContract.java
index 2993fc35b..e972b9e47 100644
--- a/private-farm/src/main/java/com/jlt/csa/domain/FarmerContract.java
+++ b/private-farm/src/main/java/com/jlt/csa/domain/FarmerContract.java
@@ -38,7 +38,7 @@ public class FarmerContract extends BaseEntity
     private Long gardenId;
 
     /** 菜地 */
-    private Farmer garden;
+    private Garden garden;
 
     /** 签约人 */
     @Excel(name = "签约人")
@@ -147,11 +147,11 @@ public class FarmerContract extends BaseEntity
         this.gardenId = gardenId;
     }
 
-    public Farmer getGarden() {
+    public Garden getGarden() {
         return garden;
     }
 
-    public void setGarden(Farmer garden) {
+    public void setGarden(Garden garden) {
         this.garden = garden;
     }
 
diff --git a/ruoyi-ui/src/views/csa/contract/enter.vue b/ruoyi-ui/src/views/csa/contract/enter.vue
index 6b0b8f853..3684add62 100644
--- a/ruoyi-ui/src/views/csa/contract/enter.vue
+++ b/ruoyi-ui/src/views/csa/contract/enter.vue
@@ -63,9 +63,18 @@
       <el-table-column label="菜地编号" align="center" prop="garden.Name">
         <template slot-scope="scope">
           <el-tag
-            :key="scope.row.contractId"
+            :key="'c' + scope.row.contractId"
             :type="scope.row.status == '1' ? 'success' : 'warning'" effect="plain">
-            {{ scope.row.garden ? scope.row.garden.Name : '未认领' }}
+            {{ scope.row.garden ? scope.row.garden.code : '未认领' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="菜地名称" align="center" prop="garden.Name">
+        <template slot-scope="scope">
+          <el-tag
+            :key="'n' + scope.row.contractId"
+            :type="scope.row.status == '1' ? 'success' : 'warning'" effect="plain">
+            {{ scope.row.garden ? (scope.row.garden.name != '' ? scope.row.garden.name : '未命名' ) : '未认领' }}
           </el-tag>
         </template>
       </el-table-column>