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

Browse Source

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

...

This commit is contained in:

qihao.gong@jikimo.com

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

parent b1d2cd1ceb 0752ba9d2d

commit ecb1f4140e

14 changed files with 950 additions and 1536 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1416

sf_mrs_connect/models/sync_common.py

File diff suppressed because it is too large Load Diff