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

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/billing/FeeTypeEnum.java

@@ -6,7 +6,7 @@ public enum FeeTypeEnum {
 //    ACCOUNT_BALANCE(7, "服务市场和供销平台购买明细"),
     SMS_PACKAGE(4, "短信套餐包明细(余额支付)"),
     SMS(3, "国内短信消费明细"),
-    INTERNATIONAL_SMS(8, "海外短信消费明细"),
+    INTERNATIONAL_SMS(8, "国际短信消费明细"),
 //    VOICE_CODE(2, "语音验证码消费明细"),
 //    DOUBLE_CALLING(6, "双向呼叫消费明细"),
 //    RECORDING_STORAGE(5, "录音存储消费明细"),

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/QrcodeController.java

@@ -357,7 +357,7 @@ public class QrcodeController {
     }
 
     private byte[] createAppletQrcode(String appkey, String path){
-        ServiceResponse<Map<String, Object>> wxaQrcode = this.weixinWxaFunService.createWxaQrcode(appkey, path, 1280);
+        ServiceResponse<Map<String, Object>> wxaQrcode = this.weixinWxaFunService.getWxaCodeUnlimit(appkey, path, "31");
         if(wxaQrcode.isSuccess()){
             Map<String, Object> result = wxaQrcode.getResult();
             return (byte[]) result.get("content");