Merge remote-tracking branch 'origin/master'

huimv-smart-management/src/main/java/com/huimv/management/controller/EmployeeController.java

@@ -88,7 +88,7 @@ public class EmployeeController {
      * 查询全部
      */
     @RequestMapping("/findAll")
-    public R findAll(Integer formFarmId){
+    public R findAll(@RequestParam Integer formFarmId){
         List list = employeeService.findAll(formFarmId);
 
         return R.ok().put("all",list);

huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthMedicalRecordServiceImpl.java

@@ -28,7 +28,7 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
 
         //耳标
         String pigId = (String) params.get("eartag");
-        wrapper.like(StringUtils.isNotBlank(pigId),"farm_id",pigId);
+        wrapper.like(StringUtils.isNotBlank(pigId),"pig_id",pigId);
 
         //疾病名称
         String diseaseName = (String) params.get("diseaseName");