# Conflicts:
#	src/main/java/com/gogirl/shared/order/StoreTechnicianPeriod.java

# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

# Conflicts:
#	src/main/java/com/gogirl/application/market/coupon/impl/CouponServiceImpl.java
#	src/test/java/com/gogirl/Test.java