Merge remote-tracking branch 'origin/master'

lige

2024-01-24 623aaa8471d6d7adf1cb9ee584fc20da6c26f603

Merge remote-tracking branch 'origin/master'

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java

@@ -682,7 +682,8 @@
    @PostMapping("/tjRefund")
    @ApiOperation(value = "体检退费按钮接口")
    public AjaxResult tjRefund(@RequestBody @ApiParam(value = "流水对象") TjFlowingWater tjFlowingWater){
        if(null == tjFlowingWater.getRefundPros()||tjFlowingWater.getRefundPros().size()==0) return AjaxResult.error("请选择退费项目");
        if (null == tjFlowingWater.getRefundPros() || tjFlowingWater.getRefundPros().size() == 0)
            return AjaxResult.error("请选择退费项目");
        tjFlowingWater.setTollCollectorId(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
        tjFlowingWater.setRefundPersonId(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
        tjFlowingWater.setRefundTime(new Date());

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java

@@ -99,7 +99,7 @@
     * 邮箱
     */
    @ExcelExport(value = "邮箱",sort =5)
    @ExcelImport("联系邮箱")
    @ExcelImport("邮箱")
    @Excel(name = "邮箱",sort = 5,cellType = Excel.ColumnType.STRING)
    @ApiModelProperty("联系邮箱")
    private String email;