From 4839d3bb3671a61e8952077dd978c2a6d2b01bad Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:20 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 2 --
server/visits/admin_timer/src/main/resources/logback-spring.xml | 1 -
h5/static/redirect.html | 4 +++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 3 +++
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/h5/static/redirect.html b/h5/static/redirect.html
index b86e4aa..91a8440 100644
--- a/h5/static/redirect.html
+++ b/h5/static/redirect.html
@@ -6,8 +6,10 @@
<script>
var p = location.href.split("?")
// window.location.href = 'https://dmtest.ahapp.net/hsvisit_h5/#/pages/notice/notice?' + p[1]
+ //http://192.168.0.173/h5/#/pages/notice/notice?code=123
+ //http://192.168.0.173/h5/#/pages/staff/index?code=123456
window.location.href = 'http://xiaopiqiu2.natapp1.cc/#/pages/notice/notice?' + p[1]
- // window.location.href = 'http://xiaopiqiu2.natapp1.cc/#/pages/staff/index?' + p[1]
+ // window.location.href = 'http://xiaopiqiu2.natapp1.cc/#/pages/staff/index?' + p[1]
</script>
</head>
<body>
diff --git a/server/visits/admin_timer/src/main/resources/logback-spring.xml b/server/visits/admin_timer/src/main/resources/logback-spring.xml
index c722d73..daa70cf 100644
--- a/server/visits/admin_timer/src/main/resources/logback-spring.xml
+++ b/server/visits/admin_timer/src/main/resources/logback-spring.xml
@@ -8,7 +8,6 @@
<property name="log.path" value="logs/visitsTimer"></property>
<property name="log.fileSize" value="100MB"></property>
<property name="log.historyDays" value="7"></property>
-
<appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 7285243..623a813 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -231,8 +231,6 @@
return ApiResponse.success(null);
}
-
-
@ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
@PostMapping("/updateCanVisitById")
@CloudRequiredPermission("business:member:update")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 3516b64..8478c38 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -104,6 +104,9 @@
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
@ExcelColumn(name="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
private Integer idcardType;
+ @ApiModelProperty(value = "鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�")
+ private Integer isDriver;
@ApiModelProperty(value = "宸ュ彿")
@ExcelColumn(name="宸ュ彿")
--
Gitblit v1.9.3