Merge branch 'score_shop' into ty_fix

Helius

2021-11-02 af7f37cbb7a0694c882bdc91174dca39796ad4ad

 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;