Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
ff5ccddd
Commit
ff5ccddd
authored
Nov 22, 2018
by
christ
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw
parents
78b790f9
4a5d0505
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
0 deletions
+1
-0
SalespersonService.php
application/models/Business/User/SalespersonService.php
+1
-0
No files found.
application/models/Business/User/SalespersonService.php
View file @
ff5ccddd
...
...
@@ -252,6 +252,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
$info
[
'qrCode'
]
=
$qrcode
;
$info
[
'memberName'
]
=
$storeInfo
[
'store_name'
];
$info
[
'memberAvatarUrl'
]
=
$storeLabel
;
$info
[
'memberAvatarUrlR20'
]
=
$storeModelDAO
->
getStoreLabelSrc
(
$storeInfo
[
'store_label'
],
''
,
''
,
true
)
.
'?x-oss-process=image/rounded-corners,r_20'
;
$info
=
array_merge
(
$info
,
$goods
);
}
else
{
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
saleActOrGoodsNotExist
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment