Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-05-04 19:04:39 +08:00
95 changed files with 256 additions and 178 deletions

View File

@@ -1,4 +1,4 @@
{{#pattern}} @Pattern(regexp="{{pattern}}"){{/pattern}}{{!
{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{!
minLength && maxLength set
}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not