Merge branch 'developer' into 'master'

Developer

See merge request !78

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MaidianLogDTO.java

@@ -59,6 +59,8 @@ public class MaidianLogDTO implements Serializable{
     private Date createTime;
 
     private Date updateTime;
+    
+    private String environment;
 
     private static final long serialVersionUID = 1L;
 
@@ -277,6 +279,14 @@ public class MaidianLogDTO implements Serializable{
 	public void setEnterpriseId(String enterpriseId) {
 		this.enterpriseId = enterpriseId;
 	}
+
+	public String getEnvironment() {
+		return environment;
+	}
+
+	public void setEnvironment(String environment) {
+		this.environment = environment;
+	}
     
     
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanMaidianLog.java

@@ -57,6 +57,8 @@ public class TabHaobanMaidianLog implements Serializable {
     private String clerkId;
     
     private String enterpriseId;
+    
+    private String environment;
 
     private static final long serialVersionUID = 1L;
 
@@ -275,6 +277,14 @@ public class TabHaobanMaidianLog implements Serializable {
 	public void setEnterpriseId(String enterpriseId) {
 		this.enterpriseId = enterpriseId;
 	}
+
+	public String getEnvironment() {
+		return environment;
+	}
+
+	public void setEnvironment(String environment) {
+		this.environment = environment;
+	}
     
     
 }
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaidianLogMapper.xml

@@ -29,11 +29,12 @@
     <result column="store_status" property="storeStatus" jdbcType="INTEGER" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="environment" property="environment" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     maidian_id, staff_id, wx_enterprise_id, phone_number, device_date, options, event, 
     url, context, scene, platform, model, brand, hbversion, system, sdk_version, version, 
-    system_info, stay_time, create_time, update_time,track_sign,store_id,store_status,clerk_code,clerk_id,enterprise_id
+    system_info, stay_time, create_time, update_time,track_sign,store_id,store_status,clerk_code,clerk_id,enterprise_id,environment
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -52,7 +53,7 @@
       scene, platform, model, 
       brand, hbversion, system, 
       sdk_version, version, system_info, 
-      stay_time, create_time, update_time,track_sign,store_status,clerk_code,store_id,clerk_id,enterprise_id
+      stay_time, create_time, update_time,track_sign,store_status,clerk_code,store_id,clerk_id,enterprise_id,environment
       )
     values (#{maidianId,jdbcType=INTEGER}, #{staffId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, 
       #{phoneNumber,jdbcType=VARCHAR}, #{deviceDate,jdbcType=TIMESTAMP}, #{options,jdbcType=VARCHAR}, 
@@ -61,7 +62,7 @@
       #{brand,jdbcType=VARCHAR}, #{hbversion,jdbcType=VARCHAR}, #{system,jdbcType=VARCHAR}, 
       #{sdkVersion,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, #{systemInfo,jdbcType=VARCHAR}, 
       #{stayTime,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{trackSign},
-      #{storeStatus},#{clerkCode},#{storeId},#{clerkId},#{enterpriseId}
+      #{storeStatus},#{clerkCode},#{storeId},#{clerkId},#{enterpriseId},#{environment}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianLog" >
@@ -139,6 +140,9 @@
       <if test="enterpriseId != null" >
         enterprise_id,
       </if>
+      <if test="environment != null" >
+        environment,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="maidianId != null" >
@@ -213,6 +217,9 @@
       <if test="enterpriseId != null" >
         #{enterpriseId},
       </if>
+       <if test="environment != null" >
+        #{environment},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianLog" >