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

puzhibing

2024-03-11 aa8afb8f18fee21361742b62061b4d4db4a09bb5

 cloud-server-other/src/main/java/com/dsh/other/entity/StoreEvaluation.java

@@ -14,7 +14,7 @@

/**
 * <p>
 *  门店评价
 * 门店评价
 * </p>
 *
 * @author jqs
@@ -68,6 +68,7 @@
     */
    @TableField("insertTime")
    private Date insertTime;

    @Override
    protected Serializable pkVal() {
        return this.id;