Conflicts: pmapi/src/main/java/com/ningdatech/pmapi/declared/manage/DeclaredProjectManage.java
# Conflicts: # ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java