Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-30 ff1ebb8f686b25c2383acb1efb79e7c01d78fc01

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

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