 沈国良
|
af3748a228
|
增加备注
|
9 months ago |
 HouXinyu
|
b319190310
|
t3
|
9 months ago |
|
HouXinyu
|
56521ce0d3
|
Merge remote-tracking branch 'remotes/origin/main' into developer
# Conflicts:
# Supermarket/bin/com/lingnan/supermarket/componet/BGPanel.class
# Supermarket/bin/com/lingnan/supermarket/dao/impl/storageRecordImpl.class
# Supermarket/bin/com/lingnan/supermarket/utils/CreateOrder.class
# Supermarket/bin/com/lingnan/supermarket/utils/JDBCUtil.class
# Supermarket/bin/com/lingnan/supermarket/utils/TimeAndOrder.class
# Supermarket/bin/com/lingnan/supermarket/view/InView.class
# Supermarket/bin/com/lingnan/supermarket/view/MainView.class
# Supermarket/src/com/lingnan/supermarket/dao/impl/storageRecordImpl.java
# Supermarket/src/com/lingnan/supermarket/utils/CreateOrder.java
# Supermarket/src/com/lingnan/supermarket/utils/JDBCUtil.java
# Supermarket/src/com/lingnan/supermarket/utils/TimeAndOrder.java
# Supermarket/src/com/lingnan/supermarket/view/InView.java
|
9 months ago |
|
HouXinyu
|
2a5310d522
|
update
|
9 months ago |
|
HouXinyu
|
4dbaa3a639
|
rollback
|
9 months ago |
|
沈国良
|
93e6105851
|
增加备注
|
9 months ago |
|
沈国良
|
7898a8bc8d
|
增加备注
|
9 months ago |
|
沈国良
|
2cdeae95ab
|
增加备注
|
9 months ago |
|
沈国良
|
4405166476
|
增加备注
|
9 months ago |
|
沈国良
|
4cc69809c7
|
增加备注
|
9 months ago |
|
沈国良
|
cbe7cb5560
|
增加备注
|
9 months ago |
|
沈国良
|
ae7aaca6f6
|
增加备注
|
9 months ago |
|
沈国良
|
8e14e78135
|
增加备注
|
9 months ago |
|
沈国良
|
b5dfd2c50e
|
增加时间备注
|
9 months ago |
|
沈国良
|
c554d51aa3
|
增加数据库备注
|
9 months ago |
|
沈国良
|
849c0cd35a
|
增加模块备注
|
9 months ago |
|
沈国良
|
22197c2e7e
|
增加收银模块备注
|
9 months ago |
 pxjfuz984
|
0a4699b5e1
|
Merge pull request '完成仓库管理部分注释' (#47) from pxjfuz984/test:branch_zyx into main
|
9 months ago |
|
郑亦歆
|
31474a5234
|
仓库系统部分注释完成
|
9 months ago |
|
pxjfuz984
|
a1c62bdaf9
|
Merge pull request '仓库管理部分已注释' (#46) from pxjfuz984/test:branch_zyx into main
|
9 months ago |
|
郑亦歆
|
5639047a02
|
仓库管理部分已注释
|
9 months ago |
|
pxjfuz984
|
623f0ce250
|
Merge pull request 'dto文件部分修改' (#45) from pxjfuz984/test:branch_zyx into main
|
9 months ago |
|
郑亦歆
|
50f85cd555
|
dto文件部分修改
|
9 months ago |
|
pxjfuz984
|
1110158a4f
|
Merge pull request 'table部分修改' (#44) from pxjfuz984/test:branch_zyx into main
|
9 months ago |
|
郑亦歆
|
8a6015ba57
|
table部分修改
|
9 months ago |
|
pxjfuz984
|
5d679b62fb
|
Merge pull request 'base文件夹部分修改' (#43) from pxjfuz984/test:branch_zyx into main
|
9 months ago |
|
郑亦歆
|
43656d2b42
|
base文件夹部分修改
|
9 months ago |
|
pxjfuz984
|
4edbca8770
|
Merge pull request 'SuperView注释' (#42) from pxjfuz984/test:branch_zyx into main
|
9 months ago |
|
郑亦歆
|
a19fdbe104
|
SuperView.java修改
|
9 months ago |
|
pxjfuz984
|
44f09f4a38
|
Merge pull request 'test.txt修改测试看代码行数是否改变' (#41) from pxjfuz984/test:branch_zyx into main
|
9 months ago |
|
郑亦歆
|
0ecdef9993
|
test.txt修改测试3
|
9 months ago |
|
郑亦歆
|
f19c4fa975
|
Merge branch 'main' into branch_zyx
# Conflicts:
# test.txt3
|
9 months ago |
|
沈国良
|
07d5eb3a49
|
解决冲突
|
9 months ago |
|
p4vsywzlp
|
0860bf5380
|
Merge pull request '21' (#40) from branch_cwf into main
|
9 months ago |
|
HouXinyu
|
9274bc6f1e
|
84925+
|
9 months ago |
|
HouXinyu
|
6e730f22f2
|
111
|
9 months ago |
|
HouXinyu
|
612c66f89e
|
Merge remote-tracking branch 'remotes/origin/main' into branch_cwf
# Conflicts:
# test.txt
|
9 months ago |
|
沈国良
|
2bd45ddbd2
|
d10
|
9 months ago |
|
HouXinyu
|
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
|
9 months ago |
Redmi
|
ac909ed42f
|
d89
|
9 months ago |
|
HouXinyu
|
caa1093536
|
d8
|
9 months ago |
|
Redmi
|
4f20056302
|
d7
|
9 months ago |
|
p4vsywzlp
|
0b500fb12f
|
d56
|
9 months ago |
|
Redmi
|
f2932379f0
|
d56
|
9 months ago |
|
m2fn43ypg
|
c6f2c99109
|
d4
|
9 months ago |
|
Redmi
|
dad9e9eb0c
|
d4
|
9 months ago |
|
Redmi
|
ef52d10929
|
1
|
9 months ago |
|
HouXinyu
|
e8f774d494
|
d3
|
9 months ago |
|
p4vsywzlp
|
d79f6a7cc2
|
d3
|
9 months ago |
|
Redmi
|
5a42e467fa
|
1111
|
9 months ago |
