Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

hai-bweb/src/main/java/com/bweb/controller/HighGasStaffController.java

@@ -164,7 +164,7 @@ public class HighGasStaffController {
                 String signId = AESEncodeUtil.base64Encode(AESEncodeUtil.aesEncryptToBytes(gasStaff.getId().toString(), key));
 
                 // 生成二维码
-                String param = CommonSysConst.getSysConfig().getHsgDomainName()+"/hsgH5?accountId=000000&gasKey=" + merchantStore.getStoreKey() + "&staffCode=" + URLEncoder.encode(signId, "UTF-8");
+                String param = CommonSysConst.getSysConfig().getHsgDomainName()+"/hsgH5?accountId=000000&key=" + merchantStore.getStoreKey() + "&code=" + URLEncoder.encode(signId, "UTF-8");
                 String qrCodeImgUrl = DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(1) +".jpg";
                 QRCodeGenerator.generateQRCodeImage(param, 350, 350, SysConst.getSysConfig().getFileUrl()+"/gasStaff/"+qrCodeImgUrl);