Merge branch 'api_score_meger'

935090232@qq.com

2022-02-20 c253b555c7905c5136d47cd615ef545fa50cc6ad

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java

@@ -32,7 +32,6 @@
   /**
    * 员工ID
    */
   @NotNull(message = "员工ID")
   private Long  staffId;