Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-10 bb71b47a43244e6db57cbc3cd0223bc5a64023d7

 src/main/java/com/zy/crm/manager/entity/BusinessTripOther.java

@@ -287,6 +287,10 @@
    @TableField("business_end_time_day")
    private Integer businessEndTimeDay;

    @ApiModelProperty(value= "业务员")
    @TableField("member_id")
    private Long memberId;

    @TableField(exist = false)
    private String pcdStart;