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

# Conflicts:
#	PAS/src/main/java/cn/cslg/pas/service/impl/ProductCategoryServiceImpl.java

PAS/src/main/java/cn/cslg/pas/service/asso/AssoProductPatentService.java

@@ -107,7 +107,6 @@ public class AssoProductPatentService extends ServiceImpl<AssoProductPatentMappe
             patentNos.removeAll(patentDTO.getNotInPatentNos());
         }
 
-
         List<String> assoPatents = new ArrayList<>();
         if (patentNos.size() != 0) {
             LambdaQueryWrapper<AssoStructurePatent> assoWrapper = new LambdaQueryWrapper<>();