Merge branch 'dev_v1.1.30_wh' of BaseService/jyMicroservices into feature/v1.1.30

jyBXCore/rpc/bxcore.proto

@@ -509,7 +509,7 @@ message SearchReturn{
 }
 message SearchMap{
   repeated Search data = 1;
-  int64  Count=2;
+  int64  count=2;
 }
 message Search{
   string title = 1;

jyBXCore/rpc/service/search.go

@@ -69,7 +69,6 @@ func GetBidSearchData(in *bxcore.SearchReq, isCache bool) (count int64, list []*
 func EntSearch(searchCode string) ([]*bxcore.Search, int64) {
 	data := make([]*bxcore.Search, 0, 0)
 	count := int64(0)
-	//sql拼接
 	musts := make([]string, 0, 0)
 	musts = append(musts, `{"range":{"company_type_int":{"to":"22"}}}`)
 	thisQuery := []string{}

jyBXCore/rpc/type/bxcore/bxcore.pb.go

@@ -4788,7 +4788,7 @@ type SearchMap struct {
 	unknownFields protoimpl.UnknownFields
 
 	Data  []*Search `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"`
-	Count int64     `protobuf:"varint,2,opt,name=Count,proto3" json:"Count,omitempty"`
+	Count int64     `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
 }
 
 func (x *SearchMap) Reset() {
@@ -5885,8 +5885,8 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x62, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x45, 0x0a, 0x09, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68,
 	0x4d, 0x61, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28,
 	0x0b, 0x32, 0x0e, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63,
-	0x68, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x4c, 0x0a,
+	0x68, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x4c, 0x0a,
 	0x06, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x10, 0x0a,
 	0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12,