--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/model/school/order/OrderInfo.java

@@ -88,6 +88,11 @@ public class OrderInfo extends BaseModel{
 	@ApiModelProperty("实洋")
 	private BigDecimal realPrice;
 	
+	@Transient
+	@ApiModelProperty("版别")
+	private String edition;
+	
+	
 	
 	
 	

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderInfoServiceImpl.java

@@ -222,6 +222,8 @@ public class FgOrderInfoServiceImpl extends BaseModelServiceImpl<OrderInfo,Integ
 			vo.setGoodsTicket(callback.getData());
 		}
 		list.forEach(entity ->{
+			entity.setName(entity.getResName());
+			entity.setEdition(entity.getPublisher());
 			//计算码洋
 			entity.setTotalPrice((entity.getPrice().multiply(new BigDecimal(1))).multiply(entity.getNum()));
 			//计算实洋