Merge branch 'master' of gitlab.cloudcross.net:ssp/ssp_web

src/main/java/com/cloudcross/ssp/model/mapper/ad-group.sql.xml

@@ -256,7 +256,7 @@
 		insert into t_adgroup
 			(name,campaign_id,order_id,agent_id,advertiser_id,active_time,expire_time,totalbudget,mode,
 			price,
-			<if test="operatorId !=null">operator,</if>
+			<if test="operatorId !=null">operator_id,</if>
 			<if test="dailyBudget !=null">dailybudget,</if>
 			<if test="maxImpression !=null">impression,</if>
 			<if test="maxClick !=null">	click,</if>
@@ -276,7 +276,7 @@
 		values
 			(#{adGroupName},#{campaignId},#{orderId},#{agentId},#{advertiserId},#{startDate},#{endDate},#{totalBudget},#{mode},
 			#{price},
-			<if test="operatorId !=null">#{operator},</if>
+			<if test="operatorId !=null">#{operatorId},</if>
 			<if test="dailyBudget !=null">#{dailyBudget},</if>
 			<if test="maxImpression !=null">#{maxImpression},</if>
 			<if test="maxClick !=null">#{maxClick},</if>