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

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

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

@@ -502,7 +502,7 @@

    public String getBusinessEndTimeDay$(){
        if (null == this.businessEndTimeDay){ return null; }
        switch (this.businessTransportation){
        switch (this.businessEndTimeDay){
            case 1:
                return TimeCalculatorUtils.timeYestMonthDay(this.businessEndTime)+ "上午";
            case 2: