代码合并、调整报名；编译通过

Browse Source

...

This commit is contained in:

FCL

2025-10-10 10:45:45 +08:00

parent e5b181d894

commit 07877f589f

624 changed files with 22199 additions and 2185 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayTaskMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessBaseSampleMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessBaseSampleMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/BaseSampleMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/BaseSampleMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigAssayMethodMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigAssayMethodProjectMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectParameterMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigAssayMethodProjectParameterMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigBaseSampleMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigBaseSampleMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigDocumentTypeMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigDocumentTypeMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigEntrustSourceMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigEntrustSourceMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigProjectMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigProjectMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigReportFieldMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigReportFieldMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigReportTemplateMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigReportTemplateMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigReportTypeMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigReportTypeMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSampleFlowMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigSampleFlowMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSampleHandoverMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigSampleHandoverMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSampleReportMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigSampleReportMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSimpleFlowCodeMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigSimpleFlowCodeMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSimpleFlowRuleMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigSimpleFlowRuleMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigStandardSampleProjectMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigStandardSampleProjectMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigStandardSampleTypeMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigStandardSampleTypeMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSubSampleMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigSubSampleMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSubSampleMethodMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigSubSampleMethodMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSubSampleParentMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigSubSampleParentMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigWarehouseLocationInfomationMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/ConfigWarehouseLocationInfomationMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/MaterialAssayStandardDetailMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/MaterialAssayStandardDetailMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/MaterialAssayStandardMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/MaterialAssayStandardMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/MaterialAssayStandardMethodMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/MaterialAssayStandardMethodMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/dic/dal/mapper/DictionaryParameterMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/dic/dal/mapper/DictionaryParameterMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/dic/dal/mapper/DictionaryProjectMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/dic/dal/mapper/DictionaryProjectMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/dic/dal/mapper/DictionarySampleFlowNodeMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/dic/dal/mapper/DictionarySampleFlowNodeMapper.xml

0

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/dic/dal/mapper/DictionarySampleTypeMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/dic/dal/mapper/DictionarySampleTypeMapper.xml