--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMapper.java

@@ -35,7 +35,7 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 			+ "<if test='form.diyTypeCode == null'>"  
 			 	+ "SELECT DISTINCT bb.id,bb.name,bb.cover,bb.subheading,bb.author,bb.isbn,bb.executiveEditor,bb.keywords,be.authorIntro,"
 				+ " DATE_FORMAT(bb.uploadTime,'%Y-%m-%d  %H:%i:%s') uploadTime,DATE_FORMAT(bb.publishTime,'%Y-%m-%d  %H:%i:%s') publishTime,"
-				+ " bb.updateTime,bb.status,g.sellingPrice as sellingPrice,g.priceType,g.dataSources,be.xmlFile,be.epubFile,be.bookIntro,bi.binding, "
+				+ " bb.updateTime,bb.status,g.sellingPrice as sellingPrice,g.priceType,g.dataSources,g.priceType,be.xmlFile,be.epubFile,be.bookIntro,bi.binding, "
 				+ " bi.edition,bi.print,bb.resourceType FROM res_book bb "  
 		        + " LEFT JOIN res_ebook be ON bb.id = be.bookId "  
 		        + " LEFT JOIN res_Book_Goods g ON be.bookId = g.objectId "
@@ -46,7 +46,7 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 			    + "SELECT DISTINCT bb.id,bb.name,bb.cover,bb.subheading,bb.author,bb.isbn,bb.executiveEditor,bb.keywords,be.authorIntro,"
 				+ " DATE_FORMAT(bb.uploadTime,'%Y-%m-%d  %H:%i:%s') uploadTime,DATE_FORMAT(bb.publishTime,'%Y-%m-%d  %H:%i:%s') publishTime,bb.updateTime,bb.status,"
 				+ " g.sellingPrice as sellingPrice,g.priceType,be.epubFile,be.bookIntro,bdt.code,bi.binding, "
-				+ " bdt.dtId,be.xmlFile,g.dataSources,bi.edition,bi.print,bb.resourceType FROM res_book bb "  
+				+ " bdt.dtId,be.xmlFile,g.dataSources,g.priceType,bi.edition,bi.print,bb.resourceType FROM res_book bb "  
 		        + " LEFT JOIN res_ebook be ON bb.id = be.bookId "  
 		        + " LEFT JOIN res_book_diy_type bdt ON be.bookId = bdt.objectId "
 		        + " LEFT JOIN res_Book_Goods g ON be.bookId = g.objectId "