Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -76,7 +76,7 @@ liquidnet:
   mongodb:
     host: s-2zeb52774ceac644.mongodb.rds.aliyuncs.com:3717,s-2ze8994d25d37d74.mongodb.rds.aliyuncs.com:3717
     port: 3717
-    user: admin
+    user: root
     pwd: Qwer1234
   service:
     adam:

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

@@ -759,7 +759,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
 
     }
     public void validate( List<GoblinFrontSelectGoods> list){
-        if(null!=list&list.size()>0){
+        if(null!=list&&list.size()>0){
             Iterator<GoblinFrontSelectGoods> it = list.iterator();
             while (it.hasNext()) {
                 GoblinFrontSelectGoods goblinFrontSelectGoods= it.next();