Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml

@@ -52,8 +52,8 @@
 
     <select id="listPaymentManagerByCus" resultType="java.lang.String">
         <![CDATA[
-        SELECT c.kanga_openid
+        SELECT DISTINCT c.kanga_openid
-        from cus_membership c, sys_managers s where c.payment_openid = s.wx_openid AND s.role & 1 >0
+        from cus_membership c, sys_managers s where c.payment_openid = s.wx_openid AND (s.role & 1 >0 or s.role & 10000000 >0)
         ]]>
     </select>
 </mapper>