* remotes/origin/20180525_adi:
  adi
  adi

# Conflicts:
#	.idea/workspace.xml
#	src/main/java/common/service/impl/ContractServiceImpl.java