fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

 zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml

@@ -761,7 +761,8 @@
      com_logo,
      com_valid,
      com_functions,
      com_plats
      com_plats,
      com_code
      from sys_company
      <where>
         <if test="record!=null">