Merge branch 'master_test' into master_test_gn
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ExpeditionManager.javaback_recharge
commit
baeb7e03cd
|
@ -309,7 +309,6 @@ public class ExpeditionManager extends MongoBase {
|
||||||
public void clearHeroItems() {
|
public void clearHeroItems() {
|
||||||
this.heroItems.clear();
|
this.heroItems.clear();
|
||||||
updateString("heroItems", this.heroItems);
|
updateString("heroItems", this.heroItems);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue