Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 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;