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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

watero-rst-web/src/main/java/com/iamberry/rst/utils/StitchAttrUtil.java

@@ -101,7 +101,7 @@ public class StitchAttrUtil {
      */
     public static void addNoPro(String...pros){
         for(String pro : pros){
-            if(pro != null && "".equals(pro))
+            if(pro != null && !"".equals(pro))
                 propertySet.add(pro);
         }
     }