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

huliguo

14 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthenticationHftx.java

@@ -448,6 +448,26 @@
     */
    @TableField(value = "legal_addr")
    private String legalAddr;
    /**
     * 协议图片地址
     */
    @TableField(value = "settle_agree_pic")
    private String settleAgreePic;
    /**
     * 协议图片编号
     */
    @TableField(value = "settle_agree_pic_no")
    private String settleAgreePicNo;
    /**
     * 协议开始时间
     */
    @TableField(value = "agree_begin_date")
    private String agreeBeginDate;
    /**
     * 协议结束时间
     */
    @TableField(value = "agree_end_date")
    private String agreeEndDate;


    @Override