Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-23 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14

 screen-api/src/main/java/com/moral/api/entity/SysDictType.java

@@ -15,7 +15,7 @@
 * </p>
 *
 * @author moral
 * @since 2021-03-09
 * @since 2021-04-16
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -40,6 +40,11 @@
    private String desc;

    /**
     * 系统内置 无法更改
     */
    private Integer system;

    /**
     * 创建时间
     */
    private Date createTime;