Merge remote-tracking branch 'git-pipIrr/master'

liurunyu

2023-12-01 dc169a4a44e3afaf20d9cfce5b2c0cca0f1f52df

 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 ;
        }