Browse code 20210324 合并冲突 dev
commit fb78567fc731dc8394cfe331c86ad54aab162030 2 parents 27833a7 + 6717b16 TAN YUE authored on 24 Mar 2021

Showing 21 changed files

• RbFreqStandMeasure/App.config
• RbFreqStandMeasure/R_DataBase/DbConnectService.cs
• RbFreqStandMeasure/R_DataBase/Dto/DetectionDto.cs
• RbFreqStandMeasure/R_DataBase/Dto/DeviceDto.cs
• RbFreqStandMeasure/R_DataBase/Model/Detection.cs
• RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs
• RbFreqStandMeasure/R_DataBase/Model/Device.cs
• RbFreqStandMeasure/R_DataBase/Model/Dict.cs
• RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs
• RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs
• RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs
• RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs
• RbFreqStandMeasure/R_DataBase/Service/DictService.cs
• RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs
• RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs
• RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
• RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
• RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs
• RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs
• RbFreqStandMeasure/R_DevService/Service/Impl/BaseInfoServiceImpl.cs
• RbFreqStandMeasure/db/model/Company.cs

Ignore Space Show notes View RbFreqStandMeasure/App.config

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/DbConnectService.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Dto/DetectionDto.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Dto/DeviceDto.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Model/Detection.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Model/Device.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Model/Dict.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Service/DictService.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs 0 → 100644

Ignore Space Show notes View RbFreqStandMeasure/R_DevService/Service/Impl/BaseInfoServiceImpl.cs 0 → 100644

Show notes View RbFreqStandMeasure/db/model/Company.cs 100644 → 0

Show line notes below