Merge branch 'develop' into FOTON

This commit is contained in:
super_liu
2022-03-21 15:16:29 +08:00
39 changed files with 3591 additions and 3550 deletions
@@ -163,12 +163,12 @@
v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
</el-button>
<el-button class="common-button-default"
v-btn-permission="''"
v-btn-permission="'e7727b0018f886127174227cdbc58f28'"
size="mini"
@click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
</el-button>
<el-button class="common-button-default"
v-btn-permission="''"
v-btn-permission="'9b718444ea1f163e8ccd492396cc9234'"
size="mini"
@click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
</el-button>