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

puzhibing

2023-07-18 87c7a162dc7621553022fbabb0486d58629a9c0c

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBillMapper.xml

@@ -43,7 +43,7 @@
                AND b.billType = #{billType}
            </if>
            <if test="billHeaderType != null">
                AND b.billHeaderType = #{addresseePhone}
                AND b.billHeaderType = #{billHeaderType}
            </if>
            <if test="roleType != null and roleType == 2">
                AND o.branchOfficeId = #{objectId}