Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-15 112473768acb75b2f9bd7eca3da035ed624e5123

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

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