Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -52,6 +52,8 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
     private SalesOrderService salesOrderService;
     @Autowired
     private InventoryService inventoryService;
+    @Autowired
+    private SysMapper sysMapper;
 
     @Override
     public ComplaintDetectInfo getDetectById(Integer detectId) {