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

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

 fanli/src/main/java/com/yeshi/fanli/mapping/msg/UserSystemMsgMapper.xml

@@ -55,8 +55,10 @@
      select
      <include refid="Base_Column_List" />
      from yeshi_ec_user_msg_system where ms_system_znx_id =
      #{id,jdbcType=BIGINT}
      #{id,jdbcType=BIGINT} and ms_uid=#{uid}
   </select>
	
	

   <select id="selectLatestUserSystemMsg" resultMap="BaseResultMap"
      parameterType="java.lang.Long">