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

..

models

Accept Merge Request #210: (feature/sf刀具功能分支 -> develop)

2023-06-29 09:37:09 +08:00

security

Merge branch refs/heads/develop into refs/heads/feature/设备维保

2023-06-28 10:39:23 +08:00

static/src

新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改

2023-06-29 09:36:54 +08:00

views

Accept Merge Request #210: (feature/sf刀具功能分支 -> develop)

2023-06-29 09:37:09 +08:00

wizard

新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改

2023-06-29 09:36:54 +08:00

__init__.py

Merge branch refs/heads/develop into refs/heads/feature/设备维保

2023-06-28 10:39:23 +08:00

__manifest__.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