Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

 phis-feign/src/main/java/com/hz/his/dto/activity/SecKillActivityDto.java

@@ -15,6 +15,8 @@

    /** 用户id */
    private String userId;
    /** 来源标识 */
    private String formCode;

//    /** 是否检查可见人群限制(0否1是) */
//    private Integer isChekSeeLimit = 0;