Merge branch 'score_shop' into api_score_meger

jyy

2021-07-22 de5d98edb80742185b91b2d892167b82a8b64430

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

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