pengdi@zoniot.com d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. vor 4 Jahren
..
JobTaskMapper.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. vor 4 Jahren
MeterReadRecordMapper.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. vor 4 Jahren
WaterMeterMapper.class d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. vor 4 Jahren