Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server into dev

mp-service/src/main/java/com/qs/mp/admin/domain/param/UserDeliverOrderQueryParam.java

@@ -24,20 +24,19 @@ public class UserDeliverOrderQueryParam {
 
 	@ApiModelProperty(value = "商品名称", required = false)
 	private String title;
-	
+
 	@ApiModelProperty(value = "订单编号", required = false)
 	private String orderId;
-	
+
 	@ApiModelProperty(value = "订单状态", required = false)
-	@JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
-	private DeliverOrderStatusEnum status;
+	private Integer status;
 
 	/**
 	 * 下单区间-开始时间
 	 */
 	@ApiModelProperty(value = "开始时间", required = false)
 	private Date startTime;
-	
+
 	/**
 	 * 下单区间-截止时间
 	 */

mp-service/src/main/java/com/qs/mp/framework/service/impl/WxUrlLinkServiceImpl.java

@@ -100,7 +100,7 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     param.put("path", path + "?" + scene); // 页面路径
     //param.put("scene", scene); // 参数
 //    param.put("check_path", true);// 为 true 时 page 必须是已经发布的小程序存在的页面（否则报错）；为 false 时允许小程序未发布或者 page 不存在
-    param.put("env_version", "release");
+    param.put("env_version", "trial");
     // 获取access_token
     String accessToken = appTokenService.getAccessToken(appId);
     InputStream in = HttpUtils.sendImagePost(