Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListActiveReq.java

@@ -22,4 +22,7 @@ public class ListActiveReq extends PageReq implements Serializable {
 
     @ApiModelProperty(value = "活动状态 1-待审核 2-通过 9-驳回")
     private Integer auditStatus;
+
+    @ApiModelProperty(value = "状态 1-启用 0-停用")
+    private Integer valid;
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseActiveMapper.xml

@@ -48,6 +48,9 @@
             <if test="param.auditStatus != null ">
                 AND active.audit_status = #{param.auditStatus}
             </if>
+            <if test="param.valid != null ">
+                AND active.valid = #{param.valid}
+            </if>
         </where>
         order by active.apply_time
     </select>