Merge branch 'esign-admin' of gitlab.gongsibao.com:jiangyong/zhichan into esign-admin

esign-admin/app/base/controller/impl/product/productCtl.js

@@ -5,7 +5,6 @@ class ProductCtl extends CtlBase {
   constructor() {
   constructor() {
     super();
     super();
     this.prodSve = system.getObject("service.product.productSve");
     this.prodSve = system.getObject("service.product.productSve");
-    this.redisClient = system.getObject("util.redisClient");
   }
   }
 
 
   async getPage (pobj, pobj2, req) {
   async getPage (pobj, pobj2, req) {

esign-admin/app/front/entry/public/apidoc/product/product.md

@@ -85,7 +85,7 @@
 
 
 ```javascript
 ```javascript
 {
 {
-     "types": [0]
+     "types": [1, 2]
 }
 }
 ```
 ```
 
 
@@ -97,13 +97,88 @@
     "msg":"success",
     "msg":"success",
     "data":[
     "data":[
         {
         {
+            "id":6,
+            "product_type":2,
+            "product_name":"asdf",
+            "price":0,
+            "ids":[
+                1,
+                7]
+        },
+        {
+            "id":11,
+            "product_type":2,
+            "product_name":"testa",
+            "price":1,
+            "ids":[
+                8,
+                9,
+                10]
+        },
+        {
+            "id":13,
+            "product_type":2,
+            "product_name":"testb",
+            "price":1,
+            "ids":[
+                8,
+                9,
+                10]
+        },
+        {
+            "id":1,
+            "product_type":1,
+            "product_name":"ss",
+            "price":0,
+            "productitems":[
+            ],
+            "ids":[
+            ]
+        },
+        {
             "id":7,
             "id":7,
-            "product_type":0, // 产品类型
-            "product_name":"ssda" // 产品名称
+            "product_type":1,
+            "product_name":"ssda",
+            "price":0,
+            "ids":[
+            ]
+        },
+        {
+            "id":8,
+            "product_type":1,
+            "product_name":"test",
+            "price":1,
+            "ids":[
+            ]
+        },
+        {
+            "id":9,
+            "product_type":1,
+            "product_name":"test",
+            "price":1,
+            "ids":[
+            ]
+        },
+        {
+            "id":10,
+            "product_type":1,
+            "product_name":"test",
+            "price":1,
+            "ids":[
+            ]
+        },
+        {
+            "id":12,
+            "product_type":1,
+            "product_name":"testa",
+            "price":1,
+            "ids":[
+            ]
         }],
         }],
-    "requestid":"7451247abe9546d88a93c274d5d9c90a"
+    "requestid":"3416a203177940c1b58354132f778f00"
 }
 }
 
 
+
 ```
 ```
 
 
 ## **<a name="getByIds"> 根据 id 数组查询 </a>**
 ## **<a name="getByIds"> 根据 id 数组查询 </a>**