fix 计费单商品

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -108,4 +108,6 @@ public class OrderGoodsVo {
 	private String remark;
 	@ApiModelProperty("录单人")
 	private String createBy;
+	@ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+	private String goodsType;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectName" column="project_name"/>
         <result property="businessName" column="business_name"/>
         <result property="createBy" column="create_by"/>
+        <result property="goodsType" column="goods_type"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -59,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             og.*,
             g.`code`,
             g.goods_name,
+            g.goods_type,
             cet.education_name,
             cpt.project_name,
             cb.business_name
@@ -81,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         og.*,
         g.`code`,
         g.goods_name,
+        g.goods_type,
         cet.education_name,
         cpt.project_name,
         cb.business_name,