1 用户管理-燃气用户 导入导出模版调整

zh-baseversion-system/src/main/resources/mapper/system/TDetectorUserMapper.xml

@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.user_id,
         a.username,
         a.nick_name,
-        (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
+        (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '工商业用户'WHEN '3' THEN '工商业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
         (CASE a.gas_type WHEN '0' THEN '天然气' WHEN '1' THEN '液化气' end) as gas_type ,
         a.address, a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks,
         b.enterprise_name,a.f_village_id,v.f_village_name,
@@ -136,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.user_id,
         a.username,
         a.nick_name,
-        (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
+        (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '工商业用户'WHEN '3' THEN '工商业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
         (CASE a.gas_type WHEN '0' THEN '天然气' WHEN '1' THEN '液化气' end) as gas_type ,
         a.address, a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks,
         b.enterprise_name,a.f_village_id,v.f_village_name
@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.user_id,
                a.username,
                a.nick_name,
-               (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
+               (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '工商业用户'WHEN '3' THEN '工商业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
                (CASE a.gas_type WHEN '0' THEN '天然气' WHEN '1' THEN '液化气' end) as gas_type ,
                a.address, a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks,
                b.enterprise_name,a.f_village_id,v.f_village_name
@@ -213,7 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectTDetectorUser" parameterType="TDetectorUser" resultMap="TDetectorUserResult">
         select a.user_id, a.beyond_enterprise_id,a.username, a.nick_name,
-               (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
+               (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '工商业用户'WHEN '3' THEN '工商业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
                (CASE a.gas_type WHEN '0' THEN '天然气' WHEN '1' THEN '液化气' end) as gas_type ,
                a.address, a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks,
                b.enterprise_name
@@ -438,9 +438,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHEN '1' THEN
                     '居民用户'
                 WHEN '2' THEN
-                    '商业用户'
+                    '工商业用户'
                 WHEN '3' THEN
-                    '工业用户'
+                    '工商业用户'
                 WHEN '4' THEN
                     '煤改气用户'
                 END