Merge branch 'score_shop' into api_score_meger

wzy

2021-11-20 eaad3c9d48cf9641726818c90741942b193484e2

 zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java

@@ -96,8 +96,6 @@
    @Autowired
    private SysOrderFlowDao sysOrderFlowDao;

    @Autowired
    RabiitMqTemplate rabiitMqTemplate;

    @Autowired
    private BusParameterSettingsDao busParameterSettingsDao;