Merge remote-tracking branch 'origin/V1' into V1

common/src/main/java/com/jpsoft/smart/modules/base/entity/CompanyInfo.java

@@ -42,4 +42,10 @@ public class CompanyInfo {
 	private Date updateTime;
     @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+	@ApiModelProperty(value = "上级公司")
+	private String parentId;
+
+	@ApiModelProperty(value = "企业编码")
+	private String code;
 }

common/src/main/resources/mapper/base/CompanyInfo.xml

@@ -14,6 +14,8 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="code" column="code_"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.CompanyInfo">
         <!--
@@ -23,7 +25,7 @@
         -->
         <![CDATA[
 		insert into base_company_info
-	    (id_,sort_no,name_,logo_,remark_,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,sort_no,name_,logo_,remark_,create_by,create_time,update_by,update_time,del_flag,parent_id,code_)
 		values
 		(
 			#{id,jdbcType=VARCHAR}
@@ -36,6 +38,8 @@
 			,#{updateBy,jdbcType=VARCHAR}
 			,#{updateTime,jdbcType= TIMESTAMP }
 			,#{delFlag,jdbcType= NUMERIC }
+			,#{parentId,jdbcType=VARCHAR}
+			,#{code,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -72,6 +76,12 @@
             <if test="delFlag!=null">
                 del_flag=#{delFlag,jdbcType= NUMERIC },
             </if>
+            <if test="parentId!=null">
+                parent_id=#{parentId,jdbcType=VARCHAR},
+            </if>
+            <if test="code!=null">
+                code_=#{code,jdbcType=VARCHAR},
+            </if>
         </set>
         where id_=#{id}
     </update>