File tree Expand file tree Collapse file tree 2 files changed +2
-7
lines changed
base/src/main/java/com/tinyengine/it/service Expand file tree Collapse file tree 2 files changed +2
-7
lines changed Original file line number Diff line number Diff line change @@ -574,10 +574,7 @@ public boolean protectDefaultPage(Page page) {
574574
575575 /**
576576 * 查询父页面
577- <<<<<<< HEAD
578- =======
579577 *
580- >>>>>>> 342bb06d8974b37e0637fb5d3512f713dccf595b
581578 * @param parentId the parentId
582579 * @return parentId the parentId
583580 */
@@ -592,10 +589,7 @@ private String getParentPage(String parentId) {
592589
593590 /**
594591 * 查询默认子页面
595- <<<<<<< HEAD
596- =======
597592 *
598- >>>>>>> 342bb06d8974b37e0637fb5d3512f713dccf595b
599593 * @param parentId the parentId
600594 * @return subPageId the subPageId
601595 */
Original file line number Diff line number Diff line change @@ -313,7 +313,8 @@ public Result<FileResult> bulkCreate(List<Component> componentList) {
313313 ComponentLibrary componentLibrary = new ComponentLibrary ();
314314 componentLibrary .setPackageName (String .valueOf (component .getNpm ().get ("package" )));
315315 componentLibrary .setVersion (component .getVersion ());
316- List <ComponentLibrary > componentLibraryList = componentLibraryMapper .queryComponentLibraryByCondition (componentLibrary );
316+ List <ComponentLibrary > componentLibraryList = componentLibraryMapper
317+ .queryComponentLibraryByCondition (componentLibrary );
317318 Integer componentLibraryId = null ;
318319 if (!componentLibraryList .isEmpty ()) {
319320 componentLibraryId = componentLibraryList .get (0 ).getId ();
You can’t perform that action at this time.
0 commit comments