qihao.gong@jikimo.com ecb1f4140e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug ...

# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py

2023-10-11 14:56:18 +08:00

..

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2023-10-11 14:56:18 +08:00

security

设备增加AGV小车,机械臂,检测设备参数

2023-10-07 17:26:09 +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/修改机床参数bug

2023-10-11 14:56:18 +08:00

__init__.py

设备维保

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

__manifest__.py

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

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