fix conflict

This commit is contained in:
lixiaopeng
2020-01-09 10:16:01 +08:00
parent 742b72d9e4
commit b93a5f2bb6
41 changed files with 262 additions and 156 deletions

View File

@@ -9,7 +9,7 @@ import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.onlinecar.OnLineCarConstants;
import com.mogo.tanlu.constant.TanluConstants;
import com.mogo.module.tanlu.constant.TanluConstants;
/**
* @author congtaowang