pengdi@zoniot.com d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
..
AlarmMeasuringDataMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
AlarmTypeMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
ConfigMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
CustomerMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceAlarmRuleMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceDataBaseMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceDataDimMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceDataGetwayMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceDataParserTplMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceDataPushConfigMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceErrorMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceManufacturerMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceMeasuringPointMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceTypeMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
DeviceValveRecordMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
MeasuringDataDefMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
MeasuringDescMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ
WaterMeterErrorDaysMapper.xml d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 gadi atpakaļ