Merge remote-tracking branch 'origin/master'

Junjie

23 小时以前 a840ef6aa8f89075cbaee87973cdece12e370a28

 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java

@@ -284,7 +284,7 @@
        List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
                .eq("crn_no", crnNo)
                .eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts)
                .orderBy(true, false, "batch_seq")
                .orderBy(true, true, "batch_seq")
        );

        for (WrkMast wrkMast : wrkMasts) {