Merge remote-tracking branch 'origin/dev2' into dev2

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/ExcuteUploadSettingService.java

@@ -20,7 +20,7 @@ public class ExcuteUploadSettingService {
      * 解析数据源配置文件
      *
      * @param sourceId 数据来源id
-     * @return 返回
+     * @return 返回数据源配置文件对象
      */
     public List<UploadSettingVO.Column> ExcuteUploadSetting(String sourceId) {
         //获得uploadSetting.json配置文件的JSON串

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/UploadPatentToDBService.java

@@ -47,7 +47,7 @@ public class UploadPatentToDBService {
      * @param uploadParamsVO        专利实体类
      * @param projectImportPatentVO 专题库专利关联数据实体类（专题库id、数据来源id、自定义字段、文件夹）
      */
-    public void uploadPatent(UploadParamsVO uploadParamsVO, ProjectImportPatentVO projectImportPatentVO) throws IOException {
+    public void uploadPatentToDB(UploadParamsVO uploadParamsVO, ProjectImportPatentVO projectImportPatentVO) throws IOException {
         //基础数据入库（取专利id）
         uploadPatentBase(uploadParamsVO);
         //摘要附图入库