Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsSupport/Model/Res.go

@@ -9,5 +9,5 @@ type Res struct {
 	StudentFlag  interface{} `json:"studentFlag,omitempty"`  //omitempty有值就输出，没值则不输出
 	ParentFlag   interface{} `json:"parentFlag,omitempty"`   //omitempty有值就输出，没值则不输出
 	PositionList interface{} `json:"positionList,omitempty"` //omitempty有值就输出，没值则不输出
-	Id           interface{} `json:"id,omitempty"`           //omitempty有值就输出，没值则不输出
+	AppId           interface{} `json:"app_id,omitempty"`           //omitempty有值就输出，没值则不输出
 }

dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go

@@ -110,7 +110,7 @@ func AddAccessSystemInfo(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, Model.Res{
 		Success: true,
-		Id:      id,
+		AppId:   id,
 		Message: "操作成功！",
 	})
 }
@@ -280,7 +280,7 @@ func GetAccessSystemRangeInfo(c *gin.Context) {
 // @Param appId formData string true "系统ID"
 // @Param rangeCode formData string true "使用范围的行政区划码、单位ID，多个用逗号分隔"
 // @Success 200 {object} Model.Res
-// @Router /support/accessSystem/SettingAccessSystemRange [post]
+// @Router /support/accessSystem/SettingAccessSystemRangeInfo [post]
 // @X-EmptyLimit ["orgId","rangeCode"]
 // @X-LengthLimit [{"orgId":"36,36"},{"rangeCode":"1,3700"}]
 // @X-TableName ["t_app_base"]

dsSupport/MyModel/AccessSystem/AccessSystemDao/AccessSystemDao.go

@@ -124,7 +124,7 @@ func ChangeAppStatus(appId string, bUse int32) error {
 		return err
 	}
 	//2、获取数据库中的完整数据
-	_, err = db.Where("app_id = ?", appId).Get(&model)
+	_, err = db.Where("app_id = ?", appId).Get(model)
 	if err != nil {
 		return err
 	}

dsSupport/docs/docs.go

@@ -1,6 +1,6 @@
 // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag at
-// 2020-09-14 09:34:08.9844517 +0800 CST m=+0.091932501
+// 2020-09-15 11:39:33.2605259 +0800 CST m=+0.164906801
 
 package docs
 
@@ -894,7 +894,7 @@ var doc = `{
                 ]
             }
         },
-        "/support/accessSystem/SettingAccessSystemRange": {
+        "/support/accessSystem/SettingAccessSystemRangeInfo": {
             "post": {
                 "description": "设置接入系统的使用范围",
                 "consumes": [
@@ -2239,6 +2239,10 @@ var doc = `{
         "Model.Res": {
             "type": "object",
             "properties": {
+                "app_id": {
+                    "description": "omitempty有值就输出，没值则不输出",
+                    "type": "object"
+                },
                 "count": {
                     "description": "omitempty有值就输出，没值则不输出",
                     "type": "object"

dsSupport/docs/swagger.json

@@ -877,7 +877,7 @@
                 ]
             }
         },
-        "/support/accessSystem/SettingAccessSystemRange": {
+        "/support/accessSystem/SettingAccessSystemRangeInfo": {
             "post": {
                 "description": "设置接入系统的使用范围",
                 "consumes": [
@@ -2222,6 +2222,10 @@
         "Model.Res": {
             "type": "object",
             "properties": {
+                "app_id": {
+                    "description": "omitempty有值就输出，没值则不输出",
+                    "type": "object"
+                },
                 "count": {
                     "description": "omitempty有值就输出，没值则不输出",
                     "type": "object"

dsSupport/docs/swagger.yaml

@@ -1,6 +1,9 @@
 definitions:
   Model.Res:
     properties:
+      app_id:
+        description: omitempty有值就输出，没值则不输出
+        type: object
       count:
         description: omitempty有值就输出，没值则不输出
         type: object
@@ -913,7 +916,7 @@ paths:
       - 12
       x-tablename:
       - t_app_base
-  /support/accessSystem/SettingAccessSystemRange:
+  /support/accessSystem/SettingAccessSystemRangeInfo:
     post:
       consumes:
       - application/x-www-form-urlencoded