Merge branch 'dev-temp-xw-202412301219-44255' into test

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCraftRouteController.java

@@ -63,8 +63,8 @@ public class MesCraftRouteController extends BaseMesController<MesCraftRoute> {
                     MesCraftRoute.class, "MesCraftRoute", true);
             List<MesCraftRouteDetail> routeDetailList = getDataAndInitValid(excelTool, file.getOriginalFilename(), file.getInputStream(),
                     MesCraftRouteDetail.class, "MesCraftRouteDetail", true);
-            //String userName = AuthUtil.getSessionUser().getUserName();
+            String userName = AuthUtil.getSessionUser().getUserName();
-            String userName ="zxw";
+            //String userName ="zxw";
             routeList.forEach(mesCraftRoute -> {
                 mesCraftRoute.setOrganizeCode(organizeCode);
                 ConvertBean.serviceModelInitialize(mesCraftRoute,userName);