Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/common/lang/en-us.js

@@ -1065,7 +1065,7 @@ module.exports = {
   Ftext: 'Text+Pull single+File',
   Nnothing: 'Null',
   Nchinese: 'Chinese',
-  NpositiveInteger: 'Positive integer',
+  NpositiveInteger: 'Integer',
   NPositivefloatingpointnumber: 'Positive float',
   NintegerOrDecimal: 'Integer decimal',
   NOneDecimalPlace: 'Decimal one',

jero-web/src/common/lang/zh-cn.js

@@ -1074,7 +1074,7 @@ module.exports = {
   Ftext: '文本+下拉单选+附件',
   Nnothing: '无',
   Nchinese: '中文',
-  NpositiveInteger: '正整数',
+  NpositiveInteger: '整数',
   NPositivefloatingpointnumber: '正浮点数',
   NintegerOrDecimal: '整数或小数',
   NOneDecimalPlace: '一位小数',