gg

ee01af8c · hezhen · bd3b80be · ee01af8c
Commit ee01af8c authored Jun 06, 2019 by hezhen
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

generator.properties ...les/ace-generator/src/main/resources/generator.properties +0 -4

No files found.
--- a/ace-modules/ace-generator/src/main/resources/generator.properties
+++ b/ace-modules/ace-generator/src/main/resources/generator.properties
 #代码生成器，配置信息
 #包名
-<<<<<<< HEAD
 package=com.xxfc.platform.tour
-=======
-package=com.xxfc.platform.order
->>>>>>> 31d78b508ffcffdbbd8def10acf3d953fbc0c855
 #作者
 author=zjw
 #Email