Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

wuzeyu

2024-12-23 9c8ab5d5d8670e524c02b8dcbb9f6876cbe6bc3c

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/TypeConversionDistrict.java

@@ -29,8 +29,6 @@
                rObj = DistrictLevel.Town ;
            }else if(sourceObj == DistrictLevel.Village.code){
                rObj = DistrictLevel.Village ;
            }else if(sourceObj == DistrictLevel.Group.code){
                rObj = DistrictLevel.Group ;
            }
            return rObj ;
        }