Merge remote-tracking branch 'origin/master'

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SelectVo.java

@@ -16,8 +16,16 @@ public class SelectVo {
     /** 名称*/
     private String name;
 
+    /**
+     * 单位
+     */
     private String unit;
 
     /** 单价*/
     private BigDecimal leasePrice;
+
+    /**
+     * 是否替换  默认0,1替换
+     */
+    private String isReplace;
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml

@@ -55,7 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT type_id   AS id,
                type_name AS `name`,
                unit_name as unit,
-               lease_price AS leasePrice
+               lease_price AS leasePrice,
+               is_replace as isReplace
         FROM ma_type
         WHERE del_flag = '0'
           AND parent_id = #{id}