Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-31 a8c87a18fed28e8cd06b20de9def11631f80ab96

 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();