融合代码 提交本地

This commit is contained in:
zhangshilin
2018-03-28 13:05:56 +08:00
parent 7f1cbee49b
commit 6e533fca41
10 changed files with 79 additions and 26 deletions

View File

@@ -147,8 +147,7 @@ desc=description
parent_id=parentid
is_leaf=whether leaf node
is_valid=whether valid
create_time=createtime
edit_time=edittime
create_time=create time
superior_config=superior configuration
config_content=configuration content
root_node=root node
@@ -156,7 +155,7 @@ leafChange=this configuration includes subnode,cannot be leaf node
typeChild=this data type will be not same with subnode
typeSame=please select the consistent upper and lower data types
isLevelNoSure=more than the maximum level
is_repeat=field content is repeat
is_repeat=content is repeat
submitting=submitting
#============yewu end======================
@@ -304,7 +303,6 @@ audit_time=audit time
yes=yes
no=no
deleted=deleted
cancel_approved=cancel approved
#==========youjianguankong end=====================