作者 陈志颖

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/partnermg into v0.7.0-dev

@@ -79,7 +79,7 @@ spec: @@ -79,7 +79,7 @@ spec:
79 - name: BUSINESS_ADMIN_HOST 79 - name: BUSINESS_ADMIN_HOST
80 value: "http://suplus-business-admin-dev.fjmaimaimai.com" 80 value: "http://suplus-business-admin-dev.fjmaimaimai.com"
81 - name: KAFKA_HOST 81 - name: KAFKA_HOST
82 - value: "192.168.0.250:9092;192.168.0.251:9092;192.168.0.252:9092" 82 + value: ""
83 - name: KAFKA_CONSUMER_ID 83 - name: KAFKA_CONSUMER_ID
84 value: "partnermg_dev" 84 value: "partnermg_dev"
85 volumes: 85 volumes:
@@ -2,19 +2,19 @@ package domain @@ -2,19 +2,19 @@ package domain
2 2
3 import "time" 3 import "time"
4 4
5 -//用户是否可用状态:【1:正常】【 2:禁用】 5 +//Users.Status用户是否可用状态:【1:正常】【 2:禁用】
6 const ( 6 const (
7 userStatusUsable int8 = 1 7 userStatusUsable int8 = 1
8 userStatusUnusable int8 = 2 8 userStatusUnusable int8 = 2
9 ) 9 )
10 10
11 -//用户是否是主管 :【1:是主管】【 2:不是主管】 11 +//Users.ChargeStatus用户是否是主管 :【1:是主管】【 2:不是主管】
12 const ( 12 const (
13 UserIsCompanyCharge int8 = 1 13 UserIsCompanyCharge int8 = 1
14 UserIsNotCompanyCharge int8 = 2 14 UserIsNotCompanyCharge int8 = 2
15 ) 15 )
16 16
17 -//用户类型 1普通用户 2主管理员 17 +//Users.AdminType 用户类型 1普通用户 2主管理员
18 const ( 18 const (
19 UserIsNotAdmin int8 = 1 19 UserIsNotAdmin int8 = 1
20 UserIsAdmin int8 = 2 20 UserIsAdmin int8 = 2