conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

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

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