Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service/blade-client/src/main/java/org/springblade/client/goods/mapper/GoodsDescMapper.xml

@@ -191,7 +191,7 @@
             and bg.status = #{GoodsDesc.status}
         </if>
         <if test='GoodsDesc.goodsTypeId!=null and GoodsDesc.goodsTypeId != ""'>
-            AND bg.goods_type_id  = #{GoodsDesc.goodsTypeId}
+            AND bg.goods_type_id  like concat(concat('%',  #{GoodsDesc.goodsTypeId}),'%')
         </if>
     </select>
     <select id="selectGoodsMessage" resultType="org.springblade.client.vo.GoodsDescVO">

blade-service/trade-finance/src/main/java/org/springblade/finance/tool/JdyTool.java

@@ -1,15 +1,15 @@
 package org.springblade.finance.tool;
-import com.aliyun.tea.*;
-import com.jdy.v7sdk.models.*;
-import com.jdy.v7sdk.business.models.*;
+
+import com.aliyun.tea.TeaConverter;
+import com.aliyun.tea.TeaPair;
+import com.jdy.v7sdk.business.models.MaterialListRequest;
+import com.jdy.v7sdk.models.AccountGroupRequest;
 import org.springblade.finance.TokenRequestQuery;
 
 public class JdyTool
 {
 
-	public static void main(String[] args_) throws Exception {
-
-		java.util.List<String> args = java.util.Arrays.asList(args_);
+	public void test() throws Exception {
 		com.jdy.v7sdk.auth auth = new com.jdy.v7sdk.auth();
 		//登录参数
 		TokenRequestQuery tokenRequestQuery = TokenRequestQuery.build(TeaConverter.buildMap(
@@ -42,10 +42,6 @@ public class JdyTool
 
 		System.out.println("请求商品列表成功 response = " + response);
 	}
-	public void test()
-	{
-
-	}
 
 }