Merge branch 'adapay_new'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/enums/FeeTypeEnum.java

mec-web/src/main/java/com/ym/mec/web/controller/SysPaymentConfigController.java

@@ -6,7 +6,6 @@ import com.ym.mec.biz.dal.page.SysPaymentConfigQueryInfo;
 import com.ym.mec.biz.service.SysPaymentConfigService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;