Merge remote-tracking branch 'origin/beta-prop-all' into beta-prop-all

jianshui-admin/src/main/resources/application-dev.yml

@@ -94,7 +94,7 @@ elephant_invoice_file: http://127.0.0.1:8081/invoice/fileUrl/
 # 德才定制 放到数据库
 #elephant_invoice_file_dc: http://127.0.0.1:8088/sdFile/
 # 大象V6数电对应平台地址
-ele_url_v6: https://js.ele12.com/order-api
+ele_url_v6: https://js.ele12.com/order-api1111
 #ele_url_v6: http://192.168.3.60:18108/order-api
 #ele_url_v6: http://127.0.0.1:18108/order-api
 # 大象纸票服务对应平台地址

jianshui-admin/src/main/resources/application.yml

@@ -46,7 +46,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:

jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java

@@ -392,7 +392,8 @@ public class BillDetailFormatUtil {
                         return AjaxResult.error("明细行含税金额使用公式计算出的税额与传入含税金额减去不含税金额（不含税单价、数量积）计算出的税额差额大于6分钱", billDetail);
                     }
                     billDetail.setTaxamt(taxAmt);
-                    billDetail.setTax(tax);
+//                    billDetail.setTax(tax);
+                    billDetail.setTax(taxs);
                     billDetail.setTaxfreeamt(taxFreeAmt);
                     return AjaxResult.success(billDetail);
                 }