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