xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
801 Commits 2 Branches 32 Tags 340 MiB
d228a3c2c7
Commit Graph

801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl
d228a3c2c7 modify default value OrderDatilList status 0->2 2022-02-16 12:10:09 +08:00
Carl
1c50dea02a fix Alipay error 2022-02-15 16:38:33 +08:00
Carl
a688f452ad fix Alipay error 2022-02-15 16:13:11 +08:00
Carl
9467be098e fix Alipay error 2022-02-15 16:07:28 +08:00
Carl
d4e107dcab fix Alipay error 2022-02-15 15:49:22 +08:00
Carl
f75e14d322 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-02-15 15:42:34 +08:00
Admin
adb5e1f32d
删除文件 smart-admin-service/smart-admin-api/src/main/resources/static/30_1.png 2022-02-15 07:41:24 +00:00
Admin
c4bb740859
删除文件 smart-admin-service/smart-admin-api/src/main/resources/static/30_1.jpg 2022-02-15 07:40:54 +00:00
Admin
f5cc194d72
!171 Leung 
Merge pull request !171 from Admin/sit-Leung-v3
 2022-02-15 07:39:53 +00:00
Carl
d8ca7803f3 fix Alipay error 2022-02-15 15:35:00 +08:00
Carl
bd60f9c591 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 2022-02-15 15:21:49 +08:00
Vion
9345f58fea Alipay disabled 2022-02-15 15:20:08 +08:00
Carl
5142d648bb Merge branch 'pro-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 
 Conflicts:
	smart-admin-service/smart-admin-api/src/main/resources/static/30_1.jpg
 2022-02-15 15:06:59 +08:00
Admin
c6f17be7c9
!168 2022-2-15 Carl 
Merge pull request !168 from Admin/sit-Carl-V3
 2022-02-15 06:54:36 +00:00
Carl
c5444db2ee fix Alipay error 2022-02-15 14:53:07 +08:00
Carl
3978b640ef fix Alipay error 2022-02-15 12:14:53 +08:00
Admin
167506c2e9
!167 2022-2-15 Carl 
Merge pull request !167 from Admin/sit-Carl-V3
 2022-02-15 04:04:17 +00:00
Admin
e97821f802
!166 2022-2-15 Leung 
Merge pull request !166 from Admin/sit-Leung-v3
 2022-02-15 04:03:14 +00:00
Carl
823e929aa4 fix Alipay error 2022-02-15 12:01:39 +08:00
Vion
6b54e91ff0 Resentation goods updated 2022-02-15 11:46:13 +08:00
Carl
0746ff4e83 exchange img 2022-02-15 11:45:27 +08:00
Admin
04ac3899df
!165 2022-2-15Carl 
Merge pull request !165 from Admin/sit-Carl-V3
 2022-02-15 03:43:22 +00:00
Carl
6bbfd08f73 exchange img 2022-02-15 11:41:51 +08:00
Carl
992b5f59cd exchange img 2022-02-15 11:36:55 +08:00
Carl
8bccdea225 upload new img 2022-02-15 11:25:59 +08:00
Admin
4497ff9ed7
!164 2022-2-15 Leung 
Merge pull request !164 from Admin/sit-Leung-v3
 2022-02-15 03:11:14 +00:00
Vion
f7defe8936 Params passing method updated 2022-02-15 11:09:43 +08:00
Admin
c2bc999967
!163 2022-2-15 Leung 
Merge pull request !163 from Admin/sit-Leung-v3
 2022-02-15 03:04:57 +00:00
Vion
bc0d396d51 RxGoods data updated 2022-02-15 10:57:42 +08:00
Carl
6de1f1d526 exchange img 2022-02-14 18:31:07 +08:00
Carl
3f8da3c192 adding JSAPI 2022-02-14 18:25:54 +08:00
Vion
79abee9fdc Alipay order generate by POST 2022-02-14 18:22:58 +08:00
Vion
31d8d14b33 API Port updated 2022-02-14 18:14:59 +08:00
Admin
d93416741f
!162 2022-2-14 Leung 
Merge pull request !162 from Admin/sit-Leung-v3
 2022-02-14 10:08:44 +00:00
Vion
7b1c005389 Coupon issue & Staging API port revised 2022-02-14 18:07:06 +08:00
Admin
cc9f3b65db
!161 2022-2-14 Leung 
Merge pull request !161 from Admin/sit-Leung-v3
 2022-02-14 09:56:36 +00:00
Vion
b636872ecd Live chat method updated , Alipay payment gatewat integrated 2022-02-14 17:50:30 +08:00
Admin
39c84ca7e3
!160 2022-2-14 Carl 
Merge pull request !160 from Admin/sit-Carl-V3
 2022-02-14 07:04:30 +00:00
Carl
76451f14d7 Alipay model 2022-02-14 15:01:35 +08:00
Vion
bf838eb78a Dev evn var updated 2022-02-14 12:47:03 +08:00
Vion
79b84335ce Resentation page added : rx goods 2022-02-14 12:44:48 +08:00
Vion
1f2dcfca2c Revert "Resentation page added : rx goods" 
This reverts commit 0fe1ff7065.
 2022-02-14 12:44:10 +08:00
Vion
0fe1ff7065 Resentation page added : rx goods 2022-02-14 12:43:10 +08:00
Admin
d15190ee1f
!159 2022-2-11 Carl 
Merge pull request !159 from Admin/sit-Leung-v3
 2022-02-11 03:56:46 +00:00
Admin
1e82e2179d
!158 2022-2-11 Leung 
Merge pull request !158 from Admin/sit-Leung-v3
 2022-02-11 03:27:23 +00:00
Vion
4ef3c32ef3 Merge branch 'sit-Leung-v3' into prd-Leung 2022-02-11 11:22:02 +08:00
Vion
6ed80def45 Dog food list updated 2022-02-11 11:21:28 +08:00
Admin
4cc84d3f49
!157 2022-2-11 Carl 
Merge pull request !157 from Admin/sit-Carl
 2022-02-11 03:08:26 +00:00
Admin
46b6263e64
!156 2022-2-11 Carl 
Merge pull request !156 from Admin/sit-Carl-V3
 2022-02-11 02:57:16 +00:00
Admin
349f2cdda8
!155 2022-2-11 Leung 
Merge pull request !155 from Admin/prd-Leung
 2022-02-11 02:49:15 +00:00