Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

Browse Source

# Conflicts:
#	sf_base/models/tool_base.py
#	sf_base/models/tool_base_new.py
#	sf_maintenance/views/maintenance_views.xml
#	sf_mrs_connect/models/res_config_setting.py

...

This commit is contained in:

jinling.yang

2023-10-19 10:53:03 +08:00

parent e7df6c14b1 9b5a0162ff

commit 14edbd85f4

13 changed files with 1040 additions and 351 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

807

sf_maintenance/views/maintenance_views.xml

File diff suppressed because it is too large Load Diff