aaa #39

Closed

p4vsywzlp wants to merge 0 commits from developer into main

p4vsywzlp commented

Owner

There is no content yet.

p4vsywzlp added 14 commits

3b4f339f5a 添加了注释信息impl v1.0

3e47192761 添加了注释信息 impl v1.0 (#3 )

Co-authored-by: pxeyinm2q <cwfeng5@qq.com>
Co-committed-by: pxeyinm2q <cwfeng5@qq.com>

6935474bb6 修改了进货模块的代码注释 (#1 )

Co-authored-by: pxeyinm2q <cwfeng5@qq.com>
Co-committed-by: pxeyinm2q <cwfeng5@qq.com>

237242ca76 添加txt

3bc2dbaac8 更新了配置文件

3b68c7ff00 添加了进货员角色并修改了用户权限

0bc7bcfb34 添加了进货员角色并修改了用户权限

2b551b5dee Merge remote-tracking branch 'origin/branch_cwf' into branch_cwf

2aae1bbccd Merge pull request 'all' (#1 ) from branch_cwf into main

dc9501074a Merge pull request 'all' (#25 ) from pxeyinm2q/test:main into branch_cwf

e7b79122d3 txt

fac9bb0d14 aall

a2e9b67ba3 txt

29a9fa2f22 Merge remote-tracking branch 'remotes/origin/developer' into branch_cwf

# Conflicts:
#	Supermarket/.idea/dataSources/5b23e521-053a-47c0-ae28-a98b513bc6ec.xml
#	Supermarket/bin/.idea/dataSources/5b23e521-053a-47c0-ae28-a98b513bc6ec.xml
#	Supermarket/bin/com/lingnan/supermarket/componet/BGPanel.class
#	Supermarket/bin/com/lingnan/supermarket/dao/impl/inOrderServiceImpl.class
#	Supermarket/bin/com/lingnan/supermarket/dialog/UserDialog$MyItemListener.class
#	Supermarket/bin/com/lingnan/supermarket/dialog/UserDialog.class
#	Supermarket/bin/com/lingnan/supermarket/dialog/UserInfDialog$MyItemListener.class
#	Supermarket/bin/com/lingnan/supermarket/dialog/UserInfDialog.class
#	Supermarket/bin/com/lingnan/supermarket/view/InView.class
#	Supermarket/bin/com/lingnan/supermarket/view/MainView.class
#	test.txt

pxjfuz984 closed this pull request

This pull request cannot be reopened because the branch was deleted.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: p4vsywzlp/test#39