Merge branch 'ty_fix' into score_shop

wzy

2021-11-11 53e83fe43dae6e7f4b7fea91ebe2baa6b871dadd

 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">