Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -556,6 +556,7 @@
         tmgc.cat_name          as "categoryName",
         tmgs.unit_id           as "unitId",
         tmgu.unit_name         as "unitName",
+        tmgu.decimal_places    as "decimalPlaces",
         tmgs.sub_unit_id       as "subUnitId",
         tmgs.conversion_factor as "conversionFactor",
         tmgs.series_id         as "seriesId",

src/main/java/com/dk/mdm/mapper/mst/StaffPurviewMapper.xml

@@ -79,7 +79,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_staff_purview
+        FROM dkic_b.t_mst_staff_purview
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}