Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/java/com/thinkgem/jeesite/modules/pay/juhezhong/service/JuHeZhongPayService.java

src/main/java/com/thinkgem/jeesite/modules/pay/juhezhong/service/JuHeZhongPayService.java

@@ -2,8 +2,10 @@ package com.thinkgem.jeesite.modules.pay.juhezhong.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.thinkgem.jeesite.common.constant.ComCode;
-import com.thinkgem.jeesite.common.utils.JuhezhongUtils;
-import com.thinkgem.jeesite.modules.pay.juhezhong.dto.*;
+import com.thinkgem.jeesite.modules.pay.juhezhong.dto.ApiQuickPayDto;
+import com.thinkgem.jeesite.modules.pay.juhezhong.dto.MerchantDto;
+import com.thinkgem.jeesite.modules.pay.juhezhong.dto.CommonDto;
+import com.thinkgem.jeesite.modules.pay.juhezhong.dto.QuickDto;
 import com.thinkgem.jeesite.modules.pay.juhezhong.utils.Bean2Map;
 import com.thinkgem.jeesite.modules.pay.juhezhong.utils.HttpUtil;
 import com.thinkgem.jeesite.modules.pay.juhezhong.utils.SignUtils;