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

jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java

@@ -115,16 +115,9 @@ public class InvoiceAllController {
         // 指定请求实例
         IInvoiceAll invoiceAllService = iInvoceiAllServiceFactory.getService("elephant_invoiceall");
 
-
-
         InvoiceAllYhdjDTO invoiceAllYhdjDTO = requestBody.toJavaObject(InvoiceAllYhdjDTO.class);
         AjaxResult result = invoiceAllService.registration(companyservice, invoiceAllYhdjDTO);
 
-        //返回处理 增加调用次数
-        if (result.isSuccess()) {
-            serviceManageService.companyConsume(SERVICE_KEY, companyservice.getCompanyid());
-        }
-
         //返回报文处理器
         IInvoiceAllResponseService incomeResponseService = new AisinoIncomeResponseAdapterImpl();
 

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

@@ -170,7 +170,7 @@ public class JcskTest {
                 "    \"async\": false,\n" +
                 "    \"bsrysfzjhm\":\"37028519930620441X\",\n" +
                 "    \"serviceId\": \"yhdj\",\n" +
-                "    \"dqbm\": \"guangdong\",\n" +
+                "    \"dqbm\": \"qingdao\",\n" +
                 "    \"nsrsbh\": \"92370214MACAAEK16E\",\n" +
                 "    \"jsonData\": {\n" +
                 "        \"bsryxm\": \"贾宁\",\n" +