Merge remote-tracking branch 'origin/master'

liujie

2023-05-24 7a1b2baf3546f62f27327f5d4209ab4311069abc

 src/main/java/com/stylefeng/guns/modular/system/model/TCompanyBasic.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@TableName("t_company_basic")
public class TCompanyBasic {
    private Integer id;
    @TableField("type")