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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

 screen-manage/src/main/java/com/moral/api/service/VersionService.java

@@ -69,6 +69,15 @@
            * @Author: 陈凯裕
            * @Date: 2021/6/9
            */
    VersionDTO queryVersionById(VersionQueryByIdForm form);
    VersionQueryDTO queryVersionById(VersionQueryByIdForm form);

    /**
    * @Description: 根据组织id查询型号
            * @Param: [organizationId]
            * @return: com.moral.api.pojo.dto.version.VersionQueryDTO
            * @Author: 陈凯裕
            * @Date: 2021/6/18
            */
    VersionQueryDTO queryByOrganizationId(Integer organizationId);

}