# Conflicts: # src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java # src/main/resources/application.yml
增加有下级不能删除的判断
# Conflicts: # src/main/resources/mbg.xml