Merge branch 'score_shop' into api_score_meger

wzy

2021-11-20 eaad3c9d48cf9641726818c90741942b193484e2

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

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