Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/resources/mapper/bms/BmsSupplierMapper.xml

@@ -100,6 +100,8 @@
             <if test="query.tenantId != null and query.tenantId != ''"> and `bms_supplier`.`tenant_id` = #{query.tenantId}</if>
             <if test="query.supplierFlag != null and query.supplierFlag != ''"> and `bms_supplier`.`supplier_flag` = #{query.supplierFlag}</if>
             <if test="query.delFlag != null"> and `bms_supplier`.`del_flag` = #{query.delFlag}</if>
+            <if test="query.stopFlag != null"> and `bms_supplier`.`stop_flag` = #{query.stopFlag}</if>
+            <if test="query.cooperatePauseFlag != null"> and `bms_supplier`.`cooperate_pause_flag` = #{query.cooperatePauseFlag}</if>
             <if test="query.delFlag == null"> and `bms_supplier`.`del_flag` = '0'</if>
             <if test="query.currUserId!=null and query.currUserId != ''">
                 and (`bms_supplier`.`user_id` = #{query.currUserId} or FIND_IN_SET(#{query.currUserId},`bms_supplier`.`other_user_ids`) )