jinling.yang 37b834b3cf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化 ...

# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py

2023-06-29 11:15:40 +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/刀具产品模板优化

2023-06-29 11:15:40 +08:00

sync_common.py

刀具同步优化完成，字段已添加

2023-06-28 20:49:16 +08:00