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

jyy

2021-03-10 503c2e1cba7975481af960d5fdfa840be647dc46

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

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