Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-30 44a808c60ee7168fda4ca0100ef793045d8b2a60

 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;