Merge remote-tracking branch 'origin/master'

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseDuckInfoController.java

@@ -161,6 +161,7 @@ public class BaseDuckInfoController {
         resultMap.put("chiNum", baseDuckInfo.getChiNum());
         resultMap.put("jiaoNum", baseDuckInfo.getJiaoNum());
         resultMap.put("batchNum", baseDuckInfo.getBatchNum());
+        resultMap.put("unitId", baseDuckInfo.getUnitId());
         resultMap.put("unitName", baseDuckInfo.getUnitName());
         resultMap.put("duckNum", baseDuckInfo.getDuckNum());
         return new Result(ResultCode.SUCCESS, resultMap);