From b73aeebc90267339a4851a68a6ebd396b7c66aea Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 17:08:01 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new

---
 app/build.gradle |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a01b02a..cd070c5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@
         minSdk 23
         targetSdk 30
         versionCode 1
-        versionName "1.3.3"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+        versionName "1.4.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         manifestPlaceholders = mfph
@@ -146,6 +146,7 @@
     //灞忓箷閫傞厤搴�
     implementation 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1'
 
+
     //鍥剧墖鍔犺浇搴�
     implementation 'com.github.bumptech.glide:glide:4.13.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
@@ -179,7 +180,6 @@
     implementation 'cn.jiguang.sdk:jpush-google:5.2.2'
     //鍒嗘瀽鍜岀敤鎴锋爣绛剧瓑鍔熻兘(鍙�夛紝闆嗘垚鏋佸厜鍒嗘瀽SDK鍚庯紝鍗冲彲鏀寔琛屼负瑙﹀彂鎺ㄩ�佹秷鎭�佹帹閫佽浆鍖栫巼缁熻锛岀敤鎴疯涓哄垎)
     implementation 'cn.jiguang.sdk:joperate:2.0.2'
-
 
 
     //鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆

--
Gitblit v1.8.0