(cherry picked from commit 2f98d7aeaa)
2f98d7aeaa
(cherry picked from commit 87a9a720b6)
87a9a720b6
# Conflicts: # hzims-service/operational/src/main/resources/template/waterMonReport.docx
# 两票bug # 设备生命周期bug