| 
														
															@@ -22,11 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         <result property="isGradeSetting"    column="is_grade_setting"    /> 
														 | 
														
														 | 
														
															         <result property="isGradeSetting"    column="is_grade_setting"    /> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         <result property="isMarket"    column="is_market"    /> 
														 | 
														
														 | 
														
															         <result property="isMarket"    column="is_market"    /> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         <result property="cardEnabledFlag"    column="card_enabled_flag"    /> 
														 | 
														
														 | 
														
															         <result property="cardEnabledFlag"    column="card_enabled_flag"    /> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        <result property="isLabel"    column="is_label"    /> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     </resultMap> 
														 | 
														
														 | 
														
															     </resultMap> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     <sql id="selectCustomerCardSettingVo"> 
														 | 
														
														 | 
														
															     <sql id="selectCustomerCardSettingVo"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         select id, card_oils_type, discount_time_setting, discount_time, present_scale, is_discount_coupon, enjoy_integral_multiple, 
														 | 
														
														 | 
														
															         select id, card_oils_type, discount_time_setting, discount_time, present_scale, is_discount_coupon, enjoy_integral_multiple, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        station_id, d.dept_name as station_name, c.create_time,discount_time_type,is_market,is_grade_setting,card_enabled_flag 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        station_id, d.dept_name as station_name, c.create_time,discount_time_type,is_market,is_grade_setting,card_enabled_flag,is_label 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         from customer_card_setting c join sys_dept d on c.station_id = d.dept_id 
														 | 
														
														 | 
														
															         from customer_card_setting c join sys_dept d on c.station_id = d.dept_id 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     </sql> 
														 | 
														
														 | 
														
															     </sql> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -99,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="updateBy != null">update_by,</if> 
														 | 
														
														 | 
														
															             <if test="updateBy != null">update_by,</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="isGradeSetting != null">is_grade_setting,</if> 
														 | 
														
														 | 
														
															             <if test="isGradeSetting != null">is_grade_setting,</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="isMarket != null">is_market,</if> 
														 | 
														
														 | 
														
															             <if test="isMarket != null">is_market,</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            <if test="isLabel != null">is_label,</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															          </trim> 
														 | 
														
														 | 
														
															          </trim> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         <trim prefix="values (" suffix=")" suffixOverrides=","> 
														 | 
														
														 | 
														
															         <trim prefix="values (" suffix=")" suffixOverrides=","> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="id != null">#{id},</if> 
														 | 
														
														 | 
														
															             <if test="id != null">#{id},</if> 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -116,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="updateBy != null">#{updateBy},</if> 
														 | 
														
														 | 
														
															             <if test="updateBy != null">#{updateBy},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="isGradeSetting != null">#{isGradeSetting},</if> 
														 | 
														
														 | 
														
															             <if test="isGradeSetting != null">#{isGradeSetting},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="isMarket != null">#{isMarket},</if> 
														 | 
														
														 | 
														
															             <if test="isMarket != null">#{isMarket},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            <if test="isLabel != null">#{isLabel},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															          </trim> 
														 | 
														
														 | 
														
															          </trim> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     </insert> 
														 | 
														
														 | 
														
															     </insert> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -135,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="updateTime != null">update_time = #{updateTime},</if> 
														 | 
														
														 | 
														
															             <if test="updateTime != null">update_time = #{updateTime},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="updateBy != null">update_by = #{updateBy},</if> 
														 | 
														
														 | 
														
															             <if test="updateBy != null">update_by = #{updateBy},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="isMarket != null">is_market = #{isMarket},</if> 
														 | 
														
														 | 
														
															             <if test="isMarket != null">is_market = #{isMarket},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            <if test="isLabel != null">is_label = #{isLabel},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="isGradeSetting != null">is_grade_setting = #{isGradeSetting},</if> 
														 | 
														
														 | 
														
															             <if test="isGradeSetting != null">is_grade_setting = #{isGradeSetting},</if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         </trim> 
														 | 
														
														 | 
														
															         </trim> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         where id = #{id} 
														 | 
														
														 | 
														
															         where id = #{id} 
														 |