改了很多,只记得后来基本完成了整合logback
Merge branch 'master' of github.com:DolphinBoy/cloudwave-core

Conflicts:
	pom.xml
	src/main/java/cwapp/com/cloudwave/fwapp/web/ResponseEntity.java
	src/main/java/cwriding/com/cloudwave/cycletrail/action/CtPictureAction.java
	src/main/java/cwriding/com/cloudwave/cycletrail/action/CtTextAction.java
	src/main/java/cwriding/com/cloudwave/cycletrail/action/CtTripMessageAction.java
	src/main/java/cwriding/com/cloudwave/cycletrail/action/TePictureAction.java
	src/main/java/cwriding/com/cloudwave/cycletrail/action/TeTextAction.java
	src/main/java/cwriding/com/cloudwave/cycletrail/action/TeTripMessageAction.java
	src/main/java/cwriding/com/cloudwave/cycletrail/domain/CtTravelNotes.java
	src/main/java/cwriding/com/cloudwave/cycletrail/domain/CtTravels.java
	src/main/java/cwriding/com/cloudwave/cycletrail/service/CtPictureService.java
	src/main/java/cwriding/com/cloudwave/cycletrail/service/CtTextService.java
	src/main/java/cwriding/com/cloudwave/cycletrail/service/CtTripMessageService.java
	src/main/java/cwriding/com/cloudwave/cycletrail/service/TePictureService.java
	src/main/java/cwriding/com/cloudwave/cycletrail/service/TeTextService.java
	src/main/java/cwriding/com/cloudwave/cycletrail/service/TeTravelMessageService.java
	src/main/java/trailends/com/cloudwave/trailends/action/CtPictureAction.java
	src/main/java/trailends/com/cloudwave/trailends/action/CtTextAction.java
	src/main/java/trailends/com/cloudwave/trailends/action/CtTripMessageAction.java
	src/main/java/trailends/com/cloudwave/trailends/domain/CtTravelNotes.java
	src/main/java/trailends/com/cloudwave/trailends/mapper/CtTravelNotesMapper.java
	src/main/java/trailends/com/cloudwave/trailends/service/CtPictureService.java
	src/main/java/trailends/com/cloudwave/trailends/service/CtTextService.java
	src/main/java/trailends/com/cloudwave/trailends/service/CtTravelNotesService.java
	src/main/java/trailends/com/cloudwave/trailends/service/CtTripMessageService.java
解决冲突