Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/resources/mapper/TabStoreGroupMapper.xml

@@ -179,7 +179,7 @@
     <if test="groupLevel != null and groupLevel != '' ">
       and group_level = #{groupLevel}
     </if>
-    <if test="parentStoreGroupId !=null and parentStoreGroupId != ''">
+    <if test="parentStoreGroupId != null">
       and parent_store_group_id = #{parentStoreGroupId}
     </if>
     order by group_level, sort