Merge branch 'score_shop' into api_score_meger

Helius

2021-11-19 66f8eeab8b21f81e310d3f7cbc2766bb8b2ec0d5

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

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