1、用户表新增字段：是否商家

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-19
+ * @Date:   2025-03-25
  * @Version: V1.0
  */
 @Api(tags="han_hai_member")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-19
+ * @Date:   2025-03-25
  * @Version: V1.0
  */
 @Data
@@ -202,6 +202,11 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "是否分销商", width = 15)
     @ApiModelProperty(value = "是否分销商")
     private java.lang.String isDai;
+	/**是否商家*/
+	@Excel(name = "是否商家", width = 15, dicCode = "is_merchants")
+	@Dict(dicCode = "is_merchants")
+    @ApiModelProperty(value = "是否商家")
+    private java.lang.String isMerchants;
 	/**推广佣金*/
 	@Excel(name = "推广佣金", width = 15)
     @ApiModelProperty(value = "推广佣金")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-19
+ * @Date:   2025-03-25
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-19
+ * @Date:   2025-03-25
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-19
+ * @Date:   2025-03-25
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -306,6 +306,11 @@
             align:"center",
             dataIndex: 'isDai'
           },
+          {
+            title:'是否商家',
+            align:"center",
+            dataIndex: 'isMerchants_dictText'
+          },
           {
             title:'推广佣金',
             align:"center",
@@ -386,6 +391,7 @@
         fieldList.push({type:'string',value:'appletAppid',text:'小程序appid',dictCode:''})
         fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
         fieldList.push({type:'string',value:'isDai',text:'是否分销商',dictCode:''})
+        fieldList.push({type:'string',value:'isMerchants',text:'是否商家',dictCode:'is_merchants'})
         fieldList.push({type:'BigDecimal',value:'recommendAmount',text:'推广佣金',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'recommendedAmount',text:'被推广佣金',dictCode:''})
         this.superFieldList = fieldList

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -183,6 +183,11 @@
               <a-input v-model="model.isDai" placeholder="请输入是否分销商"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否商家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isMerchants">
+              <j-dict-select-tag type="list" v-model="model.isMerchants" dictCode="is_merchants" placeholder="请选择是否商家" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="推广佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recommendAmount">
               <a-input-number v-model="model.recommendAmount" placeholder="请输入推广佣金" style="width: 100%" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -188,6 +188,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'isDai'
    },
+   {
+    title: '是否商家',
+    align:"center",
+    dataIndex: 'isMerchants_dictText'
+   },
    {
     title: '推广佣金',
     align:"center",
@@ -392,6 +397,14 @@ export const formSchema: FormSchema[] = [
     field: 'isDai',
     component: 'Input',
   },
+  {
+    label: '是否商家',
+    field: 'isMerchants',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_merchants"
+     },
+  },
   {
     label: '推广佣金',
     field: 'recommendAmount',