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

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -135,7 +135,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         storeSearchDTO.setSearchJson(clerkSearchDTO.getSelectJson());
         storeSearchDTO.setStoreIds(clerkSearchDTO.getStoreIds());
 
-        return this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize);
+        return this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize, "storeId,storeName,storeCode,storeInfoId,ownType");
     }
 
     @Override

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

@@ -98,7 +98,7 @@
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
             <if test="fromEnterpriseId != null">
-                #{fromEnterpriseId}
+                #{fromEnterpriseId},
             </if>
         </trim>
     </insert>