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

# Conflicts:
#	sf_mrs_connect/models/sync_common.py

2023-10-11 17:41:19 +08:00

..

__init__.py

从ftp获取cnc程序文件

2022-11-30 11:25:37 +08:00

ftp_operate.py

代码规范整理，产品页面模型和胚料的模型类型字段做显示

2023-02-09 15:26:08 +08:00

res_config_setting.py

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

sync_common.py

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

2023-10-11 17:41:19 +08:00