Merge branch 'master' into xin

xin

5 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreQualificationQueryCriteria.java

@@ -11,7 +11,7 @@
public class StoreQualificationQueryCriteria{

    @ApiModelProperty(value = "店铺资质ID", example = "1")
    private Long id;
    private Long qualificationId;

    @ApiModelProperty(value = "店铺ID", example = "1")
    private Long storeId;