Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/exception/goods/ConvertLinkExceptionException.java

@@ -6,6 +6,9 @@
    

   private static final long serialVersionUID = 1L;

   

   //不包含需要转链的文本与链接

   public final static int CODE_NONE=1;

	
   public ConvertLinkExceptionException(int code, String msg) {

      super(code, msg);

   }