Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-07-31 59c430b896ee4577857dc0725bf6a5df4b99e1f7

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

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