# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
#	galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/V/YHProductItemView.swift
#	galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/V/YHProductListMessageCell.swift