Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2025-09-01 f0c023166c7a2855c93c5cacd3267cfee6077322

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

# Conflicts:
#	ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java

@@ -33,7 +33,6 @@
     * 新增执行
     */
    @ApiModelProperty(value = "记录创建人，前端忽略")
    @JsonIgnore
    @TableField(value = "create_by", fill = FieldFill.INSERT)
    private String createBy;

@@ -63,7 +62,13 @@
    @TableField("update_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime updateTime;

    /**
     * 新增执行
     */
    @ApiModelProperty(value = "记录创建人id，前端忽略")
    @JsonIgnore
    @TableField(value = "create_id", fill = FieldFill.INSERT)
    private String createId;

    public String getCreateBy() {
        return createBy;
@@ -104,4 +109,12 @@
    public void setUpdateTime(LocalDateTime updateTime) {
        this.updateTime = updateTime;
    }

    public String getCreateId() {
        return createId;
    }

    public void setCreateId(String createId) {
        this.createId = createId;
    }
}

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -74,7 +74,7 @@
    public LoginUser login(String username, String password, String code, String uuid)
    {
        // 验证码校验
        validateCaptcha(username, code, uuid);
//        validateCaptcha(username, code, uuid);
        // 登录前置校验
        loginPreCheck(username, password);
        // 用户验证

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java

@@ -29,14 +29,18 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "供应商id")
    @TableField("supplier_id")
    private String supplierId;
    @ApiModelProperty(value = "供应商id/诊所id")
    @TableField("supplier_clinic_id")
    private String supplierClinicId;

    @ApiModelProperty(value = "诊所id")
    @TableField("clinic_id")
    private String clinicId;

    @ApiModelProperty(value = "商品来源 1=平台添加 2=线下添加")
    @TableField("goods_source")
    private String goodsSource;

    @ApiModelProperty(value = "商品名称")
    @TableField("goods_name")
    private String goodsName;

 ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml

@@ -5,7 +5,8 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TErpGoods">
        <id column="id" property="id" />
        <result column="supplier_id" property="supplierId" />
        <result column="supplier_clinic_id" property="supplierClinicId" />
        <result column="goods_source" property="goodsSource" />
        <result column="clinic_id" property="clinicId" />
        <result column="goods_name" property="goodsName" />
        <result column="goods_id_code" property="goodsIdCode" />
@@ -36,7 +37,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, supplier_id, clinic_id, goods_name, goods_id_code, quasi_number, manufacturer, formulation_spec, packing_spec, type_id, goods_yards, maintenance_interval, low_purchase_quantity, low_unit_id, is_prescription_drug, goods_spec, warning_inventory, sales_amount, packing_unit_id, instructions_use, side_effect, clinic_purchase_price, platform_commission_price, create_time, update_time, create_by,`state`, update_by, disabled
        id, supplier_clinic_id, goods_source, goods_name, goods_id_code, quasi_number, manufacturer, formulation_spec, packing_spec, type_id, goods_yards, maintenance_interval, low_purchase_quantity, low_unit_id, is_prescription_drug, goods_spec, warning_inventory, sales_amount, packing_unit_id, instructions_use, side_effect, clinic_purchase_price, platform_commission_price, create_time, update_time, create_by,`state`, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TErpGoodsVO">
        select <include refid="Base_Column_List"/>