Merge branch 'score_shop' into api_score_meger

Helius

2021-11-12 a08db25b218d0d9a3a5120865854c2db685df2df

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

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