Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-06 8e49eae6b1c33e0a02742af2657a1f2c0b89d95b

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java

@@ -37,6 +37,8 @@
    @Excel(name = "备注")
    private String remark;

    private Integer workOrderCount;

    public static YwUnitVO getVoByEntity(@NonNull YwUnit entity, YwUnitVO vo) {
        if(vo == null) {
            vo = new YwUnitVO();