Merge branch 'master' into kakaoFT

This commit is contained in:
rosewiper 2024-02-02 17:44:34 +09:00
commit feaf56a336

View File

@ -198,7 +198,7 @@ public class UserManageVO extends UserDefaultVO{
private String adminSmsNoticeYn; // 법인폰 알림여부
private String prePaymentYn; // 선불결제여부(선불: Y, 후불 : N)
private int autoCash; // 자동 충전금
private int nowChargeCash; // 충전해야될 Cash
private float nowChargeCash; // 충전해야될 Cash
private String smishingYn; // 스미싱 의심여부
private String vipYn; // VIP 여부
private float cash;
@ -259,13 +259,13 @@ public class UserManageVO extends UserDefaultVO{
public void setSmishingYn(String smishingYn) {
this.smishingYn = smishingYn;
}
public int getNowChargeCash() {
public float getNowChargeCash() {
return nowChargeCash;
}
public void setNowChargeCash(int nowChargeCash) {
public void setNowChargeCash(float nowChargeCash) {
this.nowChargeCash = nowChargeCash;
}
public String getPrePaymentYn() {
return prePaymentYn;
}