huimv-cattle/src/main/java/com/huimv/cattle/controller/SysMenuController.java

@@ -60,7 +60,6 @@ public class SysMenuController {
         }else {
             return new Result(ResultCode.FAIL,myButton);
         }
-
     }
 
 }

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/DoctorListMapper.xml

@@ -8,8 +8,7 @@
         <result column="doctor_name" property="doctorName" />
         <result column="phone" property="phone" />
         <result column="content" property="content" />
-        <result column="county_code" property="countyCode" />
-        <result column="town_code" property="townCode" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/FarmKindCountMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="farm_kind" property="farmKind" />
         <result column="farm_count" property="farmCount" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/FarmStockRankMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="farm" property="farm" />
         <result column="stock" property="stock" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/IndustryOutputMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="year" property="year" />
         <result column="sales_money" property="salesMoney" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/InsureMapper.xml

@@ -15,6 +15,7 @@
         <result column="insurance_out" property="insuranceOut" />
         <result column="premium" property="premium" />
         <result column="insurance_status" property="insuranceStatus" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/OnlineServiceMapper.xml

@@ -8,6 +8,7 @@
         <result column="doctor_count" property="doctorCount" />
         <result column="treat_count" property="treatCount" />
         <result column="farmer_count" property="farmerCount" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/OutStockMapper.xml

@@ -9,6 +9,7 @@
         <result column="month" property="month" />
         <result column="year" property="year" />
         <result column="out_stock" property="outStock" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/OverviewMapper.xml

@@ -11,6 +11,7 @@
         <result column="farm_count" property="farmCount" />
         <result column="output_value" property="outputValue" />
         <result column="variety" property="variety" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/PreventDetectionMapper.xml

@@ -9,6 +9,7 @@
         <result column="month" property="month" />
         <result column="detection_num" property="detectionNum" />
         <result column="acceptance_num" property="acceptanceNum" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/ProductionCapacityMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="year" property="year" />
         <result column="production_count" property="productionCount" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SalesCattleMapper.xml

@@ -10,6 +10,7 @@
         <result column="quarter" property="quarter" />
         <result column="sales_count" property="salesCount" />
         <result column="sales_money" property="salesMoney" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SalesCountMapper.xml

@@ -9,6 +9,7 @@
         <result column="quarter" property="quarter" />
         <result column="quarter_name" property="quarterName" />
         <result column="sales_money" property="salesMoney" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/StockMapper.xml

@@ -8,6 +8,7 @@
         <result column="fat_stock" property="fatStock" />
         <result column="cow_stock" property="cowStock" />
         <result column="bull_stock" property="bullStock" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/StockStatusMapper.xml

@@ -8,6 +8,7 @@
         <result column="breed_stock" property="breedStock" />
         <result column="calf_stock" property="calfStock" />
         <result column="raise_stock" property="raiseStock" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SubsidyCountMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="year" property="year" />
         <result column="subsidy_count" property="subsidyCount" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SuperviseMapper.xml

@@ -8,6 +8,7 @@
         <result column="supervise_name" property="superviseName" />
         <result column="supervise_code" property="superviseCode" />
         <result column="supervise_data" property="superviseData" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/VaccineDeliveryMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="year" property="year" />
         <result column="delivery_count" property="deliveryCount" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

huimv-cattle/src/main/java/com/huimv/cattle/pojo/DoctorList.java

@@ -30,7 +30,5 @@ public class DoctorList implements Serializable {
 
     private String content;
 
-    private String countyCode;
-
-    private String townCode;
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/FarmKindCount.java

@@ -28,5 +28,6 @@ public class FarmKindCount implements Serializable {
 
     private Integer farmCount;
 
+    private String farmCode;
 
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/FarmStockRank.java

@@ -28,5 +28,5 @@ public class FarmStockRank implements Serializable {
 
     private Integer stock;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/IndustryOutput.java

@@ -29,5 +29,5 @@ public class IndustryOutput implements Serializable {
 
     private BigDecimal salesMoney;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/Insure.java

@@ -46,5 +46,5 @@ public class Insure implements Serializable {
 
     private Integer insuranceStatus;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/OnlineService.java

@@ -30,5 +30,5 @@ public class OnlineService implements Serializable {
 
     private Integer farmerCount;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/OutStock.java

@@ -32,5 +32,5 @@ public class OutStock implements Serializable {
 
     private Integer outStock;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/Overview.java

@@ -37,5 +37,5 @@ public class Overview implements Serializable {
 
     private String variety;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/PreventDetection.java

@@ -34,5 +34,5 @@ public class PreventDetection implements Serializable {
 
     private Integer acceptanceNum;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/ProductionCapacity.java

@@ -28,5 +28,5 @@ public class ProductionCapacity implements Serializable {
 
     private Integer productionCount;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/SalesCattle.java

@@ -35,5 +35,5 @@ public class SalesCattle implements Serializable {
 
     private BigDecimal salesMoney;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/SalesCount.java

@@ -33,5 +33,5 @@ public class SalesCount implements Serializable {
 
     private BigDecimal salesMoney;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/Stock.java

@@ -30,5 +30,5 @@ public class Stock implements Serializable {
 
     private Integer bullStock;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/StockStatus.java

@@ -33,5 +33,5 @@ public class StockStatus implements Serializable {
     //育成牛存栏
     private Integer raiseStock;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/SubsidyCount.java

@@ -29,5 +29,5 @@ public class SubsidyCount implements Serializable {
 
     private BigDecimal subsidyCount;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/Supervise.java

@@ -30,5 +30,5 @@ public class Supervise implements Serializable {
 
     private String superviseData;
 
-
+    private String farmCode;
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/SysFarm.java

@@ -38,5 +38,4 @@ public class SysFarm implements Serializable {
 
     private String remark;
 
-
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/VaccineDelivery.java

@@ -28,5 +28,5 @@ public class VaccineDelivery implements Serializable {
 
     private Integer deliveryCount;
 
-
+    private String farmCode;
 }