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

jinpengyong

2023-08-31 e77cdf62567ba92d2d3131da20429dcbfc3b7ea2

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

@@ -64,11 +64,20 @@

    /**
    * @Description: 根据型号id查询对应的因子
            * @Param: [id]
            * @Param: [form]
            * @return: com.moral.api.pojo.dto.version.VersionDTO
            * @Author: 陈凯裕
            * @Date: 2021/6/9
            */
    VersionDTO queryVersionById(Integer id);
    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);

}