Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/java/com/matrix/system/hive/bean/Onlinebooking.java

@@ -4,7 +4,7 @@
import com.matrix.system.common.bean.EntityDTOExt;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.plugin.util.DateUtils;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.shopXcx.bean.ShopProduct;
import org.springframework.format.annotation.DateTimeFormat;

@@ -44,7 +44,7 @@
    /**
     * 预约时间
     */
    @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_ST)
    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_ST)
    private Date time;
    /**
     * 客户备注