Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml

@@ -25,10 +25,10 @@ image:
   url:
     prefix: http://192.168.1.109:8111/upload/
 kingdee: #金蝶的系统的链接账号 url等信息
-  acctID: 65641dbcf39079 #登录金蝶的账户信息 2023测试
+  acctID: 677d1e6daf9bf4 #登录金蝶的账户信息 2023测试
   userName: 信息部 #登录金蝶的账户信息 202311测试的
   password: 123456 #登录金蝶的账户信息
-  userName_administrator: Administrator #登录金蝶的账户信息 202311测试
+  userName_administrator: administrator #登录金蝶的账户信息 202311测试
   password_administrator: ANrui123456. #登录金蝶的账户信息 202311测试
   lcid: 2052 #登录金蝶的账户信息
   url: http://121.36.43.55 #金蝶财务系统ip地址

anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml

@@ -25,10 +25,10 @@ image:
   url:
     prefix: http://anrui.yyundong.com/upload/
 kingdee:
-  acctID: 65641dbcf39079 #登录金蝶的账户信息 2023011测试
+  acctID: 677d1e6daf9bf4 #登录金蝶的账户信息 2023011测试
   userName: 信息部 #登录金蝶的账户信息 202302测试的
   password: 123456 #登录金蝶的账户信息
-  userName_administrator: Administrator #登录金蝶的账户信息 2023011测试
+  userName_administrator: administrator #登录金蝶的账户信息 2023011测试
   password_administrator: ANrui123456. #登录金蝶的账户信息 2023011测试
   lcid: 2052 #登录金蝶的账户信息
   url: http://121.36.43.55 #金蝶财务系统ip地址

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java

@@ -118,7 +118,7 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
             excelVos.add(excelVo);
         }
         //定义导出的excel名字
-        String excelName = "厂家索赔单导出模板";
+        String excelName = "单车返利预提明细导出模板";
         String fileNameURL = "";
         try {
             fileNameURL = URLEncoder.encode(excelName, "UTF-8");