Merge remote-tracking branch 'origin/master'

zzw

2023-11-20 2f7e7ad6c61ac3f239a4e9a87cde634a9c3fcf00

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java

@@ -20,5 +20,5 @@
public interface SoftwareTestOrderDao extends BaseDao<SoftwareTestOrder> {

    List<SoftwareTestOrder> getList(Map<String, Object> params);
    List<DictIstance> dictList(String dictType, String projectCode);
    List<DictIstance> dictList(String dictType, String projectCode,String softName);
}