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

puzhibing

2023-06-08 d77aa9268ed02e7bda8a67aab2213e42cb5afcf4

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemBulletin.java

@@ -1,10 +1,14 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableLogic;
import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;

import java.io.Serializable;

/**