解决冲突

This commit is contained in:
mgw
2023-06-12 14:35:14 +08:00
parent e0983d0530
commit 3d04200ca7
167 changed files with 3468 additions and 7898 deletions

View File

@@ -26,7 +26,7 @@
<field name="sf_secret_key"/>
</div>
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="sf_all_sync"
<button type="object" class="oe_highlight" name="sf_all_sync" confirm="确认同步"
string="同步资源库基础数据"
/>
</div>