Merge remote-tracking branch 'origin/master'

zhoushihao

2024-06-17 47ae82867c0f1f0dc5417267fff1b5a12c33720b

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java