Merge remote-tracking branch 'origin/cjl' into dev

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionSensorUnitForm.java

@@ -16,10 +16,12 @@
@Data
public class VersionSensorUnitForm {

    private Integer versionId;

    private List<VersionSensorUnit> sensorUnits;

    public boolean valid(){
        if(sensorUnits==null)
        if(sensorUnits==null||ObjectUtils.isEmpty(versionId))
            return false;
        return true;
    }