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

zss

昨天 afacb4a693c3b7e40ccdd55bc403850709ff8a34

 src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java

@@ -35,7 +35,7 @@
        this.save(processRoute);
        String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
        String idStr = String.format("%06d", processRoute.getId());
        String newProductCode = "GY" + dateStr + idStr;
        String newProductCode = "GYLX" + dateStr + idStr;
        // 更新数据库中的productCode
        processRoute.setProcessRouteCode(newProductCode);
        return processRouteMapper.updateById(processRoute);