Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -224,6 +224,7 @@
|
||||
AND (FB.NTC_AT = 'N' OR (FB.NTC_AT = 'Y' AND FB.NTC_PD_SETUP_AT = 'N'))
|
||||
<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(serverDv, 'sopmal')">
|
||||
<include refid="selectSopmalNtceWhere"/>
|
||||
AND FB.USE_AT = 'Y'
|
||||
</if>
|
||||
AND FB.SOPMAL_CD = #{sopmalCd}
|
||||
AND FB.BBS_ID = #{bbsId}
|
||||
@@ -460,6 +461,7 @@
|
||||
</if>
|
||||
<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(serverDv, 'sopmal')">
|
||||
<include refid="selectSopmalNtceWhere"/>
|
||||
AND FB.USE_AT = 'Y'
|
||||
</if>
|
||||
AND FB.DEPTH = 0
|
||||
AND FB.SOPMAL_CD = #{sopmalCd}
|
||||
|
||||
@@ -4637,6 +4637,12 @@ CORE STYLES ABOVE - NO TOUCHY
|
||||
position: relative;
|
||||
margin-bottom: 56px;
|
||||
}
|
||||
.sub-right-content__section__btn {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.sub-right-content__halfSection {
|
||||
position: relative;
|
||||
margin-bottom: 56px;
|
||||
|
||||
@@ -4654,6 +4654,12 @@ CORE STYLES ABOVE - NO TOUCHY
|
||||
position: relative;
|
||||
margin-bottom: 56px;
|
||||
}
|
||||
.sub-right-content__section__btn {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.sub-right-content__halfSection {
|
||||
position: relative;
|
||||
margin-bottom: 56px;
|
||||
|
||||
@@ -4650,6 +4650,12 @@ CORE STYLES ABOVE - NO TOUCHY
|
||||
position: relative;
|
||||
margin-bottom: 56px;
|
||||
}
|
||||
.sub-right-content__section__btn {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.sub-right-content__halfSection {
|
||||
position: relative;
|
||||
margin-bottom: 56px;
|
||||
|
||||
Reference in New Issue
Block a user