generator Fix

ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java

@@ -56,11 +56,7 @@ public class GeneratorCodeKingbaseConfig {
     }
 
     public static void main(String[] args) {
-<<<<<<< HEAD
-         generate("Liuxinxin", "expert", PATH_LXX, "expert_avoid_company");
-=======
-        generate("Liuxinxin", "expert", PATH_LXX, "expert_meta_apply");
->>>>>>> 3fc1952d747d914fc53e00cda93621feed6be50f
+        generate("Liuxinxin", "expert", PATH_LXX, "expert_avoid_company");
     }
 
 }