Merge branch 'dev_erp' into dev_erp_gjy

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/erp/WdtServiceImpl.java

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/erp/WdtServiceImpl.java

@@ -202,8 +202,8 @@ public class WdtServiceImpl implements IGoblinErpService {
 
             List<String> list = CollectionUtil.arrayListString();
             for (int i = 0; i < contentSize; i++) {
-                String orderId = goblinRedisUtils.erpLeftPop(i);
-                if(orderId!=null) {
+                String orderId = goblinRedisUtils.erpLeftPop(0);
+                if (orderId != null) {
                     list.add(orderId);
                 }
             }