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

wang..123

2022-02-18 4901728f970314cddd9fa167cf3d3fb9476208e5

 src/main/java/com/zy/asrs/controller/MatCodeController.java

@@ -93,7 +93,7 @@
        matCode.setModiTime(new Date());
        matCode.setAppeUser(getUserId());
        matCode.setAppeTime(new Date());
        matCode.setMatNo(UUID.randomUUID().toString().replaceAll("-", ""));
       // matCode.setMatNo(UUID.randomUUID().toString().replaceAll("-", ""));
        matCodeService.insert(matCode);
        return R.ok();
    }