From 0920f23406e52e4c7149515797a317c836c9e065 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 10 Nov 2023 09:18:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/vo/WxMssVo.java | 4 +++-
1 files changed, 3 insertions(+), 1 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..3ad7ea7 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
@@ -9,5 +9,7 @@
private String touser;//������openid
private String template_id;//������������������id
private String page = "pages/index/index";//���������������������������
- private Map<String, String> data;//������������
+ private Object data;//������������
+ private String miniprogramState;
+ private String lang;
}
--
Gitblit v1.8.0