Merge remote-tracking branch 'origin/master'

mes/src/main/resources/mapper/pro/ProProductQrcodeRuleMapper.xml

@@ -39,7 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </resultMap>
 
     <sql id="selectProProductQrcodeRuleVo">
-        select rule_id, item_id, item_code, prefix, date_pattern, serial_len, item_desc, client_code, client_name, current_serial, create_by, create_time, update_by, update_time from pro_product_qrcode_rule
+        select rule_id, item_id, item_code,
+               prefix, date_pattern,
+               serial_len, item_desc,
+               client_code, client_name, current_serial,
+               create_by, create_time, update_by, update_time,template_name
+                ,template_code,template_id,template_type from pro_product_qrcode_rule
     </sql>
 
     <select id="selectProProductQrcodeRuleList" parameterType="ProProductQrcodeRule" resultMap="ProProductQrcodeRuleResult2">