Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -188,6 +188,9 @@ private static final long serialVersionUID=1L;
 
     /** 外部考前商品标签：0否1是 */
     private Integer beforeSign;
+    /** 外部考前商品题库资料url */
+    private String beforeUrl;
+
     /** 寄件标签：1是 0否 */
     @TableField(updateStrategy=FieldStrategy.IGNORED)
     private Integer mailSign;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -472,4 +472,7 @@ public class GoodsUserVo {
 
 	@ApiModelProperty("申报资料ID")
 	private Long artisanDataId;
+
+	/** 外部考前商品题库资料url */
+	private String beforeUrl;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -180,6 +180,7 @@
         <result property="externalLinkStatus" column="external_link_status"/>
         <result property="courseNum" column="course_num"/>
         <result property="examNum" column="exam_num"/>
+        <result property="beforeUrl" column="before_url"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>