Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

9 小时以前 f68d79d0ff6658795c19c2fd473fab9ff6f0640d

Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

 src/main/java/com/ruoyi/basic/dto/BaseParamDto.java

@@ -37,6 +37,9 @@
    @ApiModelProperty("参数类型(1数字 2文本)")
    private Integer paramType;

    @ApiModelProperty("参数格式")
    private String paramFormat;

    @ApiModelProperty("值模式(1单值 2区间)")
    private Integer valueMode;


 src/main/java/com/ruoyi/basic/pojo/BaseParam.java

@@ -39,6 +39,9 @@
    @ApiModelProperty("参数类型(1数字 2文本)")
    private Integer paramType;

    @ApiModelProperty("参数格式")
    private String paramFormat;

    @ApiModelProperty("值模式(1单值 2区间)")
    private Integer valueMode;


 src/main/resources/mapper/basic/BaseParamMapper.xml

@@ -7,6 +7,7 @@
        <result column="param_key" property="paramKey"/>
        <result column="param_name" property="paramName"/>
        <result column="param_type" property="paramType"/>
        <result column="param_format" property="paramFormat"/>
        <result column="value_mode" property="valueMode"/>
        <result column="unit" property="unit"/>
        <result column="default_value" property="defaultValue"/>