Conflicts:
	yzg-util-base/src/main/java/com/yanzuoguang/util/vo/Ref.java