Merge branch 'ty_fix' into score_shop

Helius

2021-11-19 402f3bbfb88548ac2952cd8de6dda68caf8871de

 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;