解决代码合并冲突

order-application-service/src/main/java/cn/freemud/adapter/OrderInvoiceAdapter.java

@@ -128,6 +128,7 @@ public class OrderInvoiceAdapter {
         request.setInvoiceTypeCode(InvoiceTypeCodeEnum.ELECTRONIC_INVOICE.getBwType());
         request.setInvoiceNo(UUID.randomUUID().toString().replaceAll("-", ""));
         request.setDrawer(createRequest.getDrawer());
+        request.setPriceTaxMark(CommonsConstant.CONSTANTS_ONE_STRING); //含税标记
 
         // 订单商品明细
         List<InvoiceProductDetailRequest> productDetailList = new ArrayList<>();

order-application-service/src/main/java/cn/freemud/constant/CommonsConstant.java

@@ -18,6 +18,8 @@ public class CommonsConstant {
 
     public static final Integer CONSTANTS_ONE_INTEGER = 1;
 
+    public static final String CONSTANTS_ONE_STRING = "1";
+
     public static final String CONSTANTS_TWO_STRING = "2";
 
     public static final Integer CONSTANTS_TWO_INTEGER = 2;

order-application-service/src/main/java/cn/freemud/entities/dto/pay/InvoiceCreateRequest.java

@@ -36,6 +36,9 @@ public class InvoiceCreateRequest {
     @NotEmpty(message = "开票人不能为空")
     private String drawer;
 
+    @ApiModelProperty(value = "含税标志,默认不含税 {0-不含税，1-含税}")
+    private String priceTaxMark = "0";
+
     @ApiModelProperty(value = "发票明细")
     private List<InvoiceProductDetailRequest> productDetailList;
 }