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

# Conflicts:
#	sf_manufacturing/models/stock.py

sf_manufacturing/models/stock.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-import logging
 import base64
 import requests
+import logging
 from re import findall as regex_findall
 from datetime import datetime, timedelta
 from re import split as regex_split