Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
Conflicts: src/main/resources/messages/message_en.properties src/main/resources/messages/message_zh_CN.properties 修改是否十六进制选项选中值
This commit is contained in:
@@ -146,7 +146,7 @@
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit }">
|
||||
<input class="form-control required number" range="[0,1]" type="text" name="ratelimit" value="${_cfg.ratelimit }">
|
||||
</div>
|
||||
<div for="ratelimit"></div>
|
||||
</div>
|
||||
|
||||
@@ -399,7 +399,7 @@ $(function(){
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
|
||||
<input class="form-control required number" range="[0,1]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
|
||||
</div>
|
||||
<div for="ratelimit"></div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user