--no commit message

app/order/src/main/java/com/zrqx/order/commons/model/Order.java

@@ -42,7 +42,7 @@ public class Order {
 	@ApiModelProperty("支付方式")
 	private String payType;
 	/** @see OrderTypeEnum */
-	@ApiModelProperty("订单类型 1实体订单2电子订单3混合订单4充值订单")
+	@ApiModelProperty("订单类型 1Vip订单2电子订单")
 	private String orderType;
 	/** @see BooleanStatusEnum */
 	@ApiModelProperty("发票冲红 0为冲红1已冲红")

app/order/src/main/java/com/zrqx/order/commons/vo/fg/FgOrderVO.java

@@ -95,4 +95,7 @@ public class FgOrderVO {
 	
 	@ApiModelProperty("订单失效时间")
 	private Date loseTime;
+	
+	@ApiModelProperty("订单类型 1Vip订单2电子订单")
+	private String orderType;
 }

app/order/src/main/java/com/zrqx/order/fg/controller/FgInvoiceController.java

@@ -113,7 +113,7 @@ public class FgInvoiceController {
 			throw new BaseException("订单id:"+ form.getId() + ",不在一年内,无法开票");
 		}
 		if (!OrderInvoiceStatusEnum.isCanMake(o.getInvoiceStatus())) {
-			throw new BaseException("订单id:"+ form.getId() + ",开票状态:" + o.getInvoiceStatus() + ";不符合开票状态");
+			throw new BaseException("开票状态:" + o.getInvoiceStatus() + ";不符合开票状态");
 		}
 		// 根据当前登录用户和订单id 修改订单发票信息,更新修改时间
 		fgOrderService.saveInvoice(form);