gqh 257ed593c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop ...

# Conflicts:
#	sf_dlm/data/product_data.xml
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_mrs_connect/controllers/controllers.py

2022-12-12 14:52:48 +08:00

..

product_data.xml

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

2022-12-12 14:52:48 +08:00