Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/param/WxSendMessageParam.java

@@ -28,9 +28,9 @@ public class WxSendMessageParam {
     private String page;
 
     /**
-     * 版本控制
+     * 跳转小程序类型 developer为开发版；trial为体验版；formal为正式版；默认为正式版
      */
-    private String miniprogram_state;
+    //private String miniprogram_state;
 
     /**
      * 填充信息

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WxServiceImpl.java

@@ -179,7 +179,7 @@ public class WxServiceImpl implements IWxService {
             String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + getAccessToken();
             WxSendMessageParam param = new WxSendMessageParam();
             param.setPage("/package_question/pages/taskList/taskList");
-            param.setMiniprogram_state("trial");
+            //param.setMiniprogram_state("formal");
             param.setTouser(openId);
             param.setTemplate_id(CommonConfig.templateId);
             Map<String, TemplateMinDto> data = new HashMap<>(3);