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

jinpengyong

2023-09-26 fd68d9efbe525e9210f7013c1f103f197f01841c

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

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -141,7 +141,7 @@
             i = Integer.parseInt(o.toString()) + 1;
        }
        //单号
        String allocationNum = "JBD" + dateString + String.format("%04d", i);
        String allocationNum = "JBD-" + dateString + String.format("%04d", i);
        allocation.setAllocationNum(allocationNum);
        if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
            allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());