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

# 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

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

..

models

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

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

security

同步刀具标准库

2023-10-19 10:49:54 +08:00

tests

处理设备与设备维保标准的关联关系方法，新增设备故障报警日志页面

2023-06-27 17:32:24 +08:00

views

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

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

__init__.py

设备维保

2023-06-25 17:37:55 +08:00

__manifest__.py

移除托盘对象 并清除所有关联关系

2023-08-17 16:33:40 +08:00