衝突解決

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java

@@ -150,5 +150,10 @@ public interface AdmissionRequestService {
      */
     List<String> judgeIsFileComplete(SupervisoryUnit bean);
 
+    /**
+     * 特殊工种列表
+     * @param bean
+     * @return
+     */
     List<AdmissionRequest> listPersonnelInfo(AdmissionRequest bean);
 }