Merge branch 'ty_fix' into score_shop

Helius

2021-11-17 85d05a766c2ec3cbcbfead95e9d31e6059df648a

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

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