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

src/main/java/com/xjrsoft/module/textbook/service/ITextbookSubscriptionService.java

@@ -57,7 +57,6 @@ public interface ITextbookSubscriptionService extends MPJBaseService<TextbookSub
 
     String instockroomExcelImport(InputStream inputStream, Long textbookSubscriptionId);
 
-
     /**
     * 更新
     *

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookSubscriptionServiceImpl.java

@@ -215,7 +215,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                                                 .selectAs(BaseCourseSubject::getName, TextbookSubscriptionItemPageVo::getCourseSubjectIdCn)
                                                 .like(StringUtils.isNotBlank(dto.getCourseSubjectIdCn()), BaseCourseSubject::getName, dto.getCourseSubjectIdCn())
                                 )
-                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getId, Textbook::getTextbookType,
+                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Textbook::getTextbookType,
                                         wp -> wp
                                                 .selectAs(DictionaryDetail::getName, TextbookSubscriptionItemPageVo::getTextbookTypeCn)
                                 )