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

cjl

2023-07-10 315ec391b2a36a6d796a8726b57b7c2b8908db12

 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;
    }