From 05fec0816d14f2e7ab303eebb43443b4bc7f78ca Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 15 十一月 2021 18:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java b/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java
index 05268c7..66d52ba 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java
@@ -38,7 +38,7 @@
     private String gender;
 	
 	@Column(name = "age")
-    private int age;
+    private String age;
 	
 	@Column(name = "job")
     private String job;
@@ -108,11 +108,11 @@
 		this.gender = gender;
 	}
 
-	public int getAge() {
+	public String getAge() {
 		return age;
 	}
 
-	public void setAge(int age) {
+	public void setAge(String age) {
 		this.age = age;
 	}
 

--
Gitblit v1.8.0