Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能

2023-06-29 17:14:48 +08:00
parent aea68f5239 3907901dc3
commit 0f7f67aade
141 changed files with 20125 additions and 4856 deletions
--- a/sf_base/models/init.py
+++ b/sf_base/models/init.py
@@ -1,11 +1,9 @@
 from . import base
 from . import common
-#from . import tool_base
-#from . import fixture_base
+from . import tool_base_new
 from . import fixture
 from . import functional_fixture
-# from . import tool_base
-from . import tool_base_new
-#from . import fixture_base
+
+