From 54beb665319b66742cdec3dffb7e298701d61582 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 07 Nov 2023 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-api/src/main/java/com/moral/api/vo/WxMssVo.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java b/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
index 706aa87..2520ace 100644
--- a/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
+++ b/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
@@ -8,6 +8,8 @@
 public class WxMssVo {
     private String touser;//������openid
     private String template_id;//������������������id
-    private String page = "pages/index/index";//���������������������������
-    private Map<String, String> data;//������������
+//    private String page = "pages/index/index";//���������������������������
+    private Object data;//������������
+    private  String miniprogramState;
+    private  String lang;
 }

--
Gitblit v1.8.0