jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	sf_manufacturing/models/stock.py
This commit is contained in:
qihao.gong@jikimo.com
2023-11-20 15:44:43 +08:00
parent 6fc735063a fdf1b786fe
commit 326181fa81
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/models/stock.py
View File

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