Merge branch 'jsp'
This commit is contained in:
commit
bc1f767543
@ -202,6 +202,21 @@ public class UserManageVO extends UserDefaultVO{
|
||||
private String smishingYn; // 스미싱 의심여부
|
||||
private String vipYn; // VIP 여부
|
||||
private float cash;
|
||||
private String blineCode; // B라인코드
|
||||
private String recommendId; // 추천아이디
|
||||
|
||||
public String getBlineCode() {
|
||||
return blineCode;
|
||||
}
|
||||
public void setBlineCode(String blineCode) {
|
||||
this.blineCode = blineCode;
|
||||
}
|
||||
public String getRecommendId() {
|
||||
return recommendId;
|
||||
}
|
||||
public void setRecommendId(String recommendId) {
|
||||
this.recommendId = recommendId;
|
||||
}
|
||||
|
||||
public float getCash() {
|
||||
return cash;
|
||||
|
||||
@ -976,6 +976,8 @@ public class EgovUserManageController {
|
||||
mberManageVO.setAdminSmsNoticeYn(userManageVO.getAdminSmsNoticeYn());
|
||||
mberManageVO.setPrePaymentYn(userManageVO.getPrePaymentYn());
|
||||
mberManageVO.setAutoCash(userManageVO.getAutoCash());
|
||||
mberManageVO.setBlineCode(userManageVO.getBlineCode());
|
||||
mberManageVO.setRecommendId(userManageVO.getRecommendId());
|
||||
|
||||
String userId = mberManageVO.getMberId();
|
||||
UserLogVO userLogVO = new UserLogVO();
|
||||
|
||||
@ -1294,7 +1294,9 @@
|
||||
ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn,
|
||||
PRE_PAYMENT_YN AS prePaymentYn,
|
||||
SMISHING_YN AS smishingYn,
|
||||
AUTO_CASH AS autoCash
|
||||
AUTO_CASH AS autoCash,
|
||||
IFNULL(BLINE_CODE, 'N') AS blineCode,
|
||||
IFNULL(RECOMMEND_ID, '') AS recommendId
|
||||
FROM LETTNGNRLMBER
|
||||
WHERE MBER_ID = #mberId#
|
||||
</select>
|
||||
|
||||
@ -2553,8 +2553,8 @@ function fnMberExceptSpamYn(){
|
||||
</c:forEach>
|
||||
</select>
|
||||
</td>
|
||||
<th></th>
|
||||
<td></td>
|
||||
<th><c:if test="${mberManageVO.blineCode != 'N'}">추천아이디/이름</c:if></th>
|
||||
<td><c:if test="${mberManageVO.blineCode != 'N'}"><c:out value='${mberManageVO.recommendId}'/></c:if></td>
|
||||
</tr>
|
||||
<c:if test="${not empty resultSpamMberInfo && mberManageVO.mberSttus == 'B'}">
|
||||
<tr>
|
||||
@ -2979,8 +2979,8 @@ function fnMberExceptSpamYn(){
|
||||
</c:forEach>
|
||||
</select>
|
||||
</td>
|
||||
<th></th>
|
||||
<td></td>
|
||||
<th><c:if test="${mberManageVO.blineCode != 'N'}">추천아이디/이름</c:if></th>
|
||||
<td><c:if test="${mberManageVO.blineCode != 'N'}"><c:out value='${mberManageVO.recommendId}'/></c:if></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>전화번호<button type="button" onclick="layerPopOpen('sms');">SMS</button></th>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user